eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0f88a98b43b8ae41529a15c52b35b5d1bbef3197
ffmpeg/libavcodec/smc.c
Michael Niedermayer cacbf64a76 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
	libavcodec/aacsbr.c
	libavcodec/amrnbdec.c
	libavcodec/takdec.c
	libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 13:07:25 +01:00

16 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink