[FFmpeg-cvslog] Merge commit 'c24469e812501903a46a06eff9722a82e136e841'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 27 11:42:15 2013 +0100| [12f203a0987935b79870a9502b7e148fa064897c] | committer: Michael Niedermayer

Merge commit 'c24469e812501903a46a06eff9722a82e136e841'

* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
	libavcodec/utils.c

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

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