[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 13:07:25 2013 +0100| [cacbf64a76acb69b2efd773e8d7ab01bc957560d] | committer: Michael Niedermayer

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 at gmx.at>

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