Michael Niedermayer d69238e991 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>

2012-12-24 15:09:58 +01:00

6.3 KiB

Raw Blame History

View Raw