FFmpeg/libavcodec
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
..
2013-03-13 15:07:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 10:31:56 +00:00
2013-03-13 09:13:54 +01:00
2013-03-13 14:35:48 +01:00
2013-03-13 14:35:48 +01:00