* commit '63d744e2':
  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>