[FFmpeg-cvslog] utils: flush on successfull av_seek_frame_binary()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 21 22:26:13 2011 +0200| [f73f68b8941176e61b821055af83d3be48adc711] | committer: Michael Niedermayer

utils: flush on successfull av_seek_frame_binary()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f73f68b8941176e61b821055af83d3be48adc711
---

 libavformat/utils.c     |    1 +
 tests/ref/seek/lavf_asf |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b931f77..2ae0750 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1602,6 +1602,7 @@ int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts
     if ((ret = avio_seek(s->pb, pos, SEEK_SET)) < 0)
         return ret;
 
+    ff_read_frame_flush(s);
     av_update_cur_dts(s, st, ts);
 
     return 0;
diff --git a/tests/ref/seek/lavf_asf b/tests/ref/seek/lavf_asf
index 18e4fb9..cebf283 100644
--- a/tests/ref/seek/lavf_asf
+++ b/tests/ref/seek/lavf_asf
@@ -2,51 +2,51 @@ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts:-0.317000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
 ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.740831
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 1 flags:0  ts:-0.058000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:  29375 size:   208
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st: 0 flags:0  ts:-0.482000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 0.201000
 ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  70975 size:   209
 ret: 0         st:-1 flags:0  ts:-0.904994
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 1 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts:-0.222000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size: 28487
 ret: 0         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
 ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.645825