diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:10:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:10:25 +0200 |
| commit | 853a93804d16c79028ba8005d4c033a403fc34f9 (patch) | |
| tree | 19778ac21caaa269684c4b04ed981ea9921b92f1 /libavcodec/wmalosslessdec.c | |
| parent | e5ce6d447b952658b8a8568c807baeab5cf58783 (diff) | |
| parent | d9a2e87b1ce44cce23801e7ec6810f8bf994fa23 (diff) | |
| download | ffmpeg-853a93804d16c79028ba8005d4c033a403fc34f9.tar.gz | |
Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'
* commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23':
mpeg12: move mpeg_decode_frame() lower
avsdec: Set dimensions instead of relying on the demuxer.
wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
Conflicts:
libavcodec/avs.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
| -rw-r--r-- | libavcodec/wmalosslessdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 7d6bd8e756..6e5dcb8ad6 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1229,8 +1229,8 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, /* Reset number of saved bits so that the decoder does not start * to decode incomplete frames in the s->len_prefix == 0 case. */ s->num_saved_bits = 0; - init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); s->packet_loss = 0; + init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); } } else { @@ -1279,11 +1279,11 @@ static void flush(AVCodecContext *avctx) s->packet_loss = 1; s->packet_done = 0; s->num_saved_bits = 0; - init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); s->frame_offset = 0; s->next_packet_start = 0; s->cdlms[0][0].order = 0; s->frame.nb_samples = 0; + init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); } AVCodec ff_wmalossless_decoder = { |