[FFmpeg-devel] [PATCH 3/3] ffserver: use codec time_base for stream

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Wed Nov 30 03:28:56 EET 2016


This fixes producing swf and rm files as done by ffservertest.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 ffserver.c                    | 2 +-
 tests/ffserver.regression.ref | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 20f5995..ffd75d4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3529,7 +3529,7 @@ static LayeredAVStream *add_av_stream1(FFServerStream *stream,
     //NOTE we previously allocated internal & internal->avctx, these seemed uneeded though
     fst->codecpar = avcodec_parameters_alloc();
     fst->index = stream->nb_streams;
-    fst->time_base = (AVRational) {1, 90000};
+    fst->time_base = codec->time_base;
     fst->pts_wrap_bits = 33;
     fst->sample_aspect_ratio = codec->sample_aspect_ratio;
     stream->streams[stream->nb_streams++] = fst;
diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref
index ec7b37c..f796b50 100644
--- a/tests/ffserver.regression.ref
+++ b/tests/ffserver.regression.ref
@@ -1,11 +1,11 @@
 233020d119085ba47535d5f2faf73cc0 *ff-test_h.avi
 431b75d1f12cb039acebad61a3d39225 *ff-test_l.avi
-d41d8cd98f00b204e9800998ecf8427e *ff-test.swf
+a767dbdf5d1bded3450279f812f97b37 *ff-test.swf
 dc16f607e13328a832e73801cd21ec98 *ff-test_h.asf
 69337d6c8cd7ac7e626338decdbf41d3 *ff-test_l.asf
-d41d8cd98f00b204e9800998ecf8427e *ff-test_h.rm
-d41d8cd98f00b204e9800998ecf8427e *ff-test_l.rm
+06f5a6a4c5d1c6735f4d0068e825c91f *ff-test_h.rm
+1f57580f02f0317407b3b82a3d5e093f *ff-test_l.rm
 4c887dfc1dd0f6ea1a3a2be6dd32e495 *ff-test.jpg
 1d04b73b04aad27793cc762d5afabac1 *ff-test_small.jpg
 bc36c40ee34ebee6ffe50f3094aab733 *ff-test.mjpg
-9b72c3d6d89a038fa141fe636baa2c0e *ff-stat
+db129c1b1b7fd55e101591392ba88854 *ff-stat
-- 
2.10.2



More information about the ffmpeg-devel mailing list