[FFmpeg-cvslog] Merge commit '7d8482640058d66867602a6f58446c9342d9d146'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 31 13:26:12 2012 +0100| [ca95d1b32df1a059be48404a3f1f598725a64d03] | committer: Michael Niedermayer

Merge commit '7d8482640058d66867602a6f58446c9342d9d146'

* commit '7d8482640058d66867602a6f58446c9342d9d146':
  cavs: deMpegEncContextize

Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext

Conflicts:
	libavcodec/cavs.c
	libavcodec/cavsdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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