aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-08-09 11:55:22 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-08-14 11:17:45 +0200
commit690ef618b1b0deae8a63ff7f3e4517c4adb70929 (patch)
tree96916caf2fff023fae6ecb5cbc2e6122aea90fcb
parente4f4d99df829d957f8f5541a3665d6631bdf94ca (diff)
downloadffmpeg-690ef618b1b0deae8a63ff7f3e4517c4adb70929.tar.gz
ffmpeg: copy subtitles frame dimensions.
The sub-movtextenc ref file changes because the dimensions (400×60) are stored by the format.
-rw-r--r--ffmpeg.c4
-rw-r--r--tests/ref/fate/sub-movtextenc2
2 files changed, 5 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5aeaba217a..043f68cb52 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2188,6 +2188,10 @@ static int transcode_init(void)
break;
case AVMEDIA_TYPE_SUBTITLE:
codec->time_base = (AVRational){1, 1000};
+ if (!codec->width) {
+ codec->width = input_streams[ost->source_index]->st->codec->width;
+ codec->height = input_streams[ost->source_index]->st->codec->height;
+ }
break;
default:
abort();
diff --git a/tests/ref/fate/sub-movtextenc b/tests/ref/fate/sub-movtextenc
index deafb64162..8f97497cdf 100644
--- a/tests/ref/fate/sub-movtextenc
+++ b/tests/ref/fate/sub-movtextenc
@@ -1 +1 @@
-42640029a44ce4c5748e5e7ba5c189fd
+0435265a76ab2f6e66627089d76845f4