Browse code
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>
Andreas Cadhalpun authored on 2016/11/30 09:49:09Showing 2 changed files
| ... | ... |
@@ -3561,7 +3561,7 @@ static LayeredAVStream *add_av_stream1(FFServerStream *stream, |
| 3561 | 3561 |
//NOTE we previously allocated internal & internal->avctx, these seemed uneeded though |
| 3562 | 3562 |
fst->codecpar = avcodec_parameters_alloc(); |
| 3563 | 3563 |
fst->index = stream->nb_streams; |
| 3564 |
- fst->time_base = (AVRational) {1, 90000};
|
|
| 3564 |
+ fst->time_base = codec->time_base; |
|
| 3565 | 3565 |
fst->pts_wrap_bits = 33; |
| 3566 | 3566 |
fst->sample_aspect_ratio = codec->sample_aspect_ratio; |
| 3567 | 3567 |
stream->streams[stream->nb_streams++] = fst; |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
233020d119085ba47535d5f2faf73cc0 *ff-test_h.avi |
| 2 | 2 |
431b75d1f12cb039acebad61a3d39225 *ff-test_l.avi |
| 3 |
-d41d8cd98f00b204e9800998ecf8427e *ff-test.swf |
|
| 3 |
+a767dbdf5d1bded3450279f812f97b37 *ff-test.swf |
|
| 4 | 4 |
dc16f607e13328a832e73801cd21ec98 *ff-test_h.asf |
| 5 | 5 |
69337d6c8cd7ac7e626338decdbf41d3 *ff-test_l.asf |
| 6 |
-d41d8cd98f00b204e9800998ecf8427e *ff-test_h.rm |
|
| 7 |
-d41d8cd98f00b204e9800998ecf8427e *ff-test_l.rm |
|
| 6 |
+06f5a6a4c5d1c6735f4d0068e825c91f *ff-test_h.rm |
|
| 7 |
+1f57580f02f0317407b3b82a3d5e093f *ff-test_l.rm |
|
| 8 | 8 |
4c887dfc1dd0f6ea1a3a2be6dd32e495 *ff-test.jpg |
| 9 | 9 |
1d04b73b04aad27793cc762d5afabac1 *ff-test_small.jpg |
| 10 | 10 |
bc36c40ee34ebee6ffe50f3094aab733 *ff-test.mjpg |
| 11 |
-56c8b3ba2c4f3eebfa6d2a895e042ee3 *ff-stat |
|
| 11 |
+128530a16464be60d27d013c30401851 *ff-stat |