• Michael Niedermayer's avatar
    Merge commit 'e3db3429' · d13f434d
    Michael Niedermayer authored
    * commit 'e3db3429':
      amrnb: decode directly to the user-provided AVFrame
      als: decode directly to the user-provided AVFrame
      alac: decode directly to the user-provided AVFrame
      adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
      adx: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/alsdec.c
    	libavcodec/amrnbdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d13f434d
Name
Last commit
Last update
compat Loading commit data...
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffmpeg.h Loading commit data...
ffmpeg_filter.c Loading commit data...
ffmpeg_opt.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...