Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 12:10:25 +0000 (14:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Sep 2012 12:10:25 +0000 (14:10 +0200)
commit853a93804d16c79028ba8005d4c033a403fc34f9
tree19778ac21caaa269684c4b04ed981ea9921b92f1
parente5ce6d447b952658b8a8568c807baeab5cf58783
parentd9a2e87b1ce44cce23801e7ec6810f8bf994fa23
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>
libavcodec/mpeg12.c
libavcodec/wmalosslessdec.c