virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Show subtitle resolution in avcodec_string().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-04 01:51:07 +02:00
parent e5c338ba7a 6fcfafff84
commit 54d628a580
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utils.c
View File

@@ -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); enc->time_base.num / g, enc->time_base.den / g);
} }
break; break;
case AVMEDIA_TYPE_SUBTITLE:
if (enc->width)
snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %dx%d", enc->width, enc->height);
break;
default: default:
return; return;
} }