diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-22 00:22:21 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-22 00:22:21 +0000 |
| commit | 60a04f7fc9cf491522c3e213fa039bf6d3163232 (patch) | |
| tree | ec1c1dce9dd8a0a980dfc4935dd5c8f2bcf9ea57 | |
| parent | b453924f3c63ee212c397410266fdbb1ffb8f2aa (diff) | |
use av_seek_frame to flush demxu pending packets, fixes seeking, should have been done when av_find_stream_info was added
Originally committed as revision 13855 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffserver.c | 2 | ||||
| -rw-r--r-- | tests/ffserver.regression.ref | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ffserver.c b/ffserver.c index 27c998a1c2..4f80490675 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1953,7 +1953,7 @@ static int open_input_stream(HTTPContext *c, const char *info) #if 1 if (c->fmt_in->iformat->read_seek) - c->fmt_in->iformat->read_seek(c->fmt_in, 0, stream_pos, 0); + av_seek_frame(c->fmt_in, -1, stream_pos, 0); #endif /* set the start time (needed for maxtime and RTP packet timing) */ c->start_time = cur_time; diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref index ac1b46957d..dc03c4223b 100644 --- a/tests/ffserver.regression.ref +++ b/tests/ffserver.regression.ref @@ -1,10 +1,10 @@ 18c4ba0e8e7adb781216e38de61c2e39 ff-test_h.avi -9818d41feb3e41efd5137c722f86f8f0 ff-test_l.avi -d976848a9e4d5d8fc2659e4841cdece5 ff-test.swf -93f1e29f7b292ebbd4d97d58661caefb ff-test_h.asf -0661a8f94a3450c133c81342450c28fb ff-test_l.asf -c6d60a807e4d61483a9ac28660e8361e ff-test_h.rm -e27f6a97432365da9449411b97f8dfa8 ff-test_l.rm -35d3332d7ef440273e8ebcfedeeae1ca ff-test.jpg -fe20235b8830e3a0e49a51dfcfb2a7a7 ff-test_small.jpg -a22cc793b9f938cc05cd0c56ccf9423c ff-test.mjpg +4f11d850f564af3359951b46ed1e571e ff-test_l.avi +59c7b9ea84ea3d0e9fed64340f06a3d8 ff-test.swf +7869c3c4173745faa19dbc70fb199bb9 ff-test_h.asf +7367fd8c4dc4253af98c66df318e5307 ff-test_l.asf +76180cc972bd4bd46bc9104c82c971d9 ff-test_h.rm +edc63f73e1cd02841e3120b03c8133d6 ff-test_l.rm +d41d8cd98f00b204e9800998ecf8427e ff-test.jpg +d41d8cd98f00b204e9800998ecf8427e ff-test_small.jpg +dad98a8937cdbf7e57cef745d5558970 ff-test.mjpg |