Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)
commitfa92ee821bba1d3c2a497ed22e41927b552856f8
tree26bb0752049f1abb82e03e127f175ff2c0b78387
parent905e7eb41389e4394e9c6e459b7d1a99dc30b075
parent63d744e2be39466e3a734c2987cd713e0bac101e
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'

* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/alsdec.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/cavsdec.c
libavcodec/flacdec.c
libavcodec/libopencore-amr.c
libavcodec/mjpegdec.c
libavcodec/proresdec_lgpl.c
libavcodec/vc1.c
libavcodec/vp6.c
libavcodec/wmalosslessdec.c
libavformat/mpegts.c
libavformat/oggparseskeleton.c
libavformat/spdifdec.c