Michael Niedermayer fa92ee821b 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>

2013-03-14 12:30:19 +01:00

3.1 KiB

Raw Blame History

View Raw