Michael Niedermayer cacbf64a76 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
	libavcodec/aacsbr.c
	libavcodec/amrnbdec.c
	libavcodec/takdec.c
	libavcodec/tta.c

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

2013-03-14 13:07:25 +01:00

17 KiB

Raw Blame History

View Raw