Commit d2e5297e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '79626865'

* commit '79626865':
  asfdec: always reset packet state after seeking
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 839d6bc1 79626865
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment