RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '796268654c7807c9a1cfb322c838383e2b900d60' 

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-12 16:34:14 +02:00
parent 839d6bc192 796268654c
commit d2e5297e93
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/asfdec_o.c
View File

@ -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;
}