[FFmpeg-cvslog] Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 30 14:10:25 2012 +0200| [853a93804d16c79028ba8005d4c033a403fc34f9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=853a93804d16c79028ba8005d4c033a403fc34f9
---