Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:52:12 +0000 (12:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:52:12 +0000 (12:52 +0100)
commit13795dbb642cecf46e75fb6a78c830bf862c2310
tree1464c0fd10f716b7c75920cc5b9298ca48251ca8
parenta9ddb624890dd8c334617239793e63d93fbd52ee
parent6d97484d72e33f7dde9493a9ead1a72e2f029605
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'

* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
36 files changed:
libavcodec/aacdec.c
libavcodec/adx.c
libavcodec/alac.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/apedec.c
libavcodec/atrac3.c
libavcodec/cdxl.c
libavcodec/cinepak.c
libavcodec/cook.c
libavcodec/dcadec.c
libavcodec/h264.c
libavcodec/imc.c
libavcodec/indeo3.c
libavcodec/indeo4.c
libavcodec/loco.c
libavcodec/mlpdec.c
libavcodec/mpc7.c
libavcodec/mss2.c
libavcodec/pictordec.c
libavcodec/ptx.c
libavcodec/qcelpdec.c
libavcodec/ralf.c
libavcodec/sunrast.c
libavcodec/truemotion1.c
libavcodec/truespeech.c
libavcodec/utvideodec.c
libavcodec/v210x.c
libavcodec/vc1dec.c
libavcodec/vorbis_parser.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavcodec/wnv1.c
libavcodec/xwddec.c
libavcodec/zmbv.c
libavformat/rsodec.c