Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:09:58 +0000 (15:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:09:58 +0000 (15:09 +0100)
commitd69238e991844cb0e9407c26e64dd7a551aa5bab
treea6169232d84d75370f66dcf011f8d7ee45594f8a
parentc6664242e0700ea0bc10109c7e84c3f9cf7fb9ae
parentf3298f12997eb4b7ad203766f768f92e3dd72a2a
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@gmx.at>
18 files changed:
configure
libavcodec/anm.c
libavcodec/cinepak.c
libavcodec/h264.c
libavcodec/pictordec.c
libavcodec/ptx.c
libavcodec/truemotion1.c
libavcodec/truespeech.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavformat/anm.c
libavformat/au.c
libavformat/filmstripdec.c
libavformat/mtv.c
libavformat/oggdec.c
libavformat/rsodec.c
libavformat/smjpegdec.c
libavformat/spdifenc.c