[FFmpeg-devel] [PATCH 6/6] ffmpeg: copy subtitles frame dimensions.

Nicolas George nicolas.george at normalesup.org
Thu Aug 9 13:10:35 CEST 2012


The sub-movtextenc ref file changes because the dimensions
(400×60) are stored by the format.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 ffmpeg.c                      |    4 ++++
 tests/ref/fate/sub-movtextenc |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


Rebased on top of Anton's split.


diff --git a/ffmpeg.c b/ffmpeg.c
index 1ab7985..aaeb6f7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2181,6 +2181,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 deafb64..8f97497 100644
--- a/tests/ref/fate/sub-movtextenc
+++ b/tests/ref/fate/sub-movtextenc
@@ -1 +1 @@
-42640029a44ce4c5748e5e7ba5c189fd
+0435265a76ab2f6e66627089d76845f4
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list