Browse Source

Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
d2e5297e93
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavformat/asfdec_o.c

+ 2
- 4
libavformat/asfdec_o.c View File

@@ -1558,12 +1558,10 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
} else { } else {
if ((ret = ff_seek_frame_binary(s, stream_index, timestamp, flags)) < 0) if ((ret = ff_seek_frame_binary(s, stream_index, timestamp, flags)) < 0)
return ret; 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; return 0;
} }




Loading…
Cancel
Save