diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-30 01:49:09 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-30 22:38:10 +0100 |
| commit | 122190392b297b7cd9783641d880df887fd80d07 (patch) | |
| tree | 0d6713539d18c263a4aded862e90aec6b622e869 | |
| parent | 7f034a02cdcfa9feb621b4722e85bfcbca6957a7 (diff) | |
| download | ffmpeg-122190392b297b7cd9783641d880df887fd80d07.tar.gz | |
ffserver: use codec time_base for stream
This fixes producing swf and rm files as done by ffservertest.
Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | ffserver.c | 2 | ||||
| -rw-r--r-- | tests/ffserver.regression.ref | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c index 8745181379..d6b7b44be6 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3561,7 +3561,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 8629d528da..3fdb6d6097 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 -56c8b3ba2c4f3eebfa6d2a895e042ee3 *ff-stat +128530a16464be60d27d013c30401851 *ff-stat |