[FFmpeg-cvslog] Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 24 15:09:58 2012 +0100| [d69238e991844cb0e9407c26e64dd7a551aa5bab] | committer: Michael Niedermayer

Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'

* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

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

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