diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 01:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 01:51:11 +0200 |
| commit | 54d628a580bea7bfcd84461ef6d953c3e09d908a (patch) | |
| tree | c36c29f14b6983d638d72fa7c30bac85aa1664f3 | |
| parent | e5c338ba7abd086b54021da885dc3b451927f4d5 (diff) | |
| parent | 6fcfafff8456942172a4b610454175a5d289270b (diff) | |
| download | ffmpeg-54d628a580bea7bfcd84461ef6d953c3e09d908a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Show subtitle resolution in avcodec_string().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4e510e69e4..497cf15e10 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2668,6 +2668,11 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) enc->time_base.num / g, enc->time_base.den / g); } break; + case AVMEDIA_TYPE_SUBTITLE: + if (enc->width) + snprintf(buf + strlen(buf), buf_size - strlen(buf), + ", %dx%d", enc->width, enc->height); + break; default: return; } |