diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:29:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:29:11 +0100 |
| commit | 47f1af47b6cb763452c5bab3704ca965fccad25b (patch) | |
| tree | 23e8d19a05e911ab848649aed363b8f3ddbfc299 /libavcodec | |
| parent | 1f5b5b8062706c20da0f8ca048917ae5f19107b2 (diff) | |
| parent | 70762508ec5919474edb92a5b1f266fd06640f9c (diff) | |
| download | ffmpeg-streaming-47f1af47b6cb763452c5bab3704ca965fccad25b.zip ffmpeg-streaming-47f1af47b6cb763452c5bab3704ca965fccad25b.tar.gz | |
Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'
* commit '70762508ec5919474edb92a5b1f266fd06640f9c':
lavc: Prettify printing of codec tags containing non alphanumeric characters
h264: Rename the jpeg_420 pixfmt list to match the common naming structure
Conflicts:
libavcodec/h264.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0cf6091..9aec72a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2161,14 +2161,14 @@ size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_ta { int i, len, ret = 0; -#define IS_PRINT(x) \ +#define TAG_PRINT(x) \ (((x) >= '0' && (x) <= '9') || \ ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') || \ ((x) == '.' || (x) == ' ' || (x) == '-' || (x) == '_')) for (i = 0; i < 4; i++) { len = snprintf(buf, buf_size, - IS_PRINT(codec_tag&0xFF) ? "%c" : "[%d]", codec_tag&0xFF); + TAG_PRINT(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF); buf += len; buf_size = buf_size > len ? buf_size - len : 0; ret += len; |
