eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 22:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
016c00cf68a481000f48ece6c11f622ba65e8045
ffmpeg/libavcodec/libopencore-amr.c
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

12 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink