Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'

* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

1 files changed, 2 insertions, 4 deletions

diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index 483569fec3..7a5dcc0b73 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@@ -1558,12 +1558,10 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
     } else {
         if ((ret = ff_seek_frame_binary(s, stream_index, timestamp, flags)) < 0)
             return ret;
-
-        // asf_read_timestamp is called inside ff_seek_frame_binary and leaves state dirty,
-        // so reset_packet_state have to be called after it.
-        reset_packet_state(s);
     }
 
+    reset_packet_state(s);
+
     return 0;
 }