eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-08 15:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
2dd2ee96eb95da7d0cd96198d72296902453fac2
ffmpeg/libavcodec/libopusdec.c
Michael Niedermayer afe30fe060 Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f' 
* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/libopusdec.c
	libavcodec/mace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-13 12:14:46 +01:00

6.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink