aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cngenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 15:18:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 15:18:12 +0100
commit874c5b02c4117d5261365d0de727c0b4dc9363f6 (patch)
tree6cab3de646de322069cc3b3ebda8a4425ea07040 /libavcodec/cngenc.c
parent4727611d489387aed926469ac757b2f1dfea3e33 (diff)
parent594d4d5df3c70404168701dd5c90b7e6e5587793 (diff)
downloadffmpeg-874c5b02c4117d5261365d0de727c0b4dc9363f6.tar.gz
Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cngenc.c')
0 files changed, 0 insertions, 0 deletions