• Michael Niedermayer's avatar
    Merge commit '059a9348' · 29d147c9
    Michael Niedermayer authored
    * commit '059a9348':
      lavc: Consistently prefix input buffer defines
    
    Conflicts:
    	doc/examples/decoding_encoding.c
    	libavcodec/4xm.c
    	libavcodec/aac_adtstoasc_bsf.c
    	libavcodec/aacdec.c
    	libavcodec/aacenc.c
    	libavcodec/ac3dec.h
    	libavcodec/asvenc.c
    	libavcodec/avcodec.h
    	libavcodec/avpacket.c
    	libavcodec/dvdec.c
    	libavcodec/ffv1enc.c
    	libavcodec/g2meet.c
    	libavcodec/gif.c
    	libavcodec/h264.c
    	libavcodec/h264_mp4toannexb_bsf.c
    	libavcodec/huffyuvdec.c
    	libavcodec/huffyuvenc.c
    	libavcodec/jpeglsenc.c
    	libavcodec/libxvid.c
    	libavcodec/mdec.c
    	libavcodec/motionpixels.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/noise_bsf.c
    	libavcodec/nuv.c
    	libavcodec/nvenc.c
    	libavcodec/options.c
    	libavcodec/parser.c
    	libavcodec/pngenc.c
    	libavcodec/proresenc_kostya.c
    	libavcodec/qsvdec.c
    	libavcodec/svq1enc.c
    	libavcodec/tiffenc.c
    	libavcodec/truemotion2.c
    	libavcodec/utils.c
    	libavcodec/utvideoenc.c
    	libavcodec/vc1dec.c
    	libavcodec/wmalosslessdec.c
    	libavformat/adxdec.c
    	libavformat/aiffdec.c
    	libavformat/apc.c
    	libavformat/apetag.c
    	libavformat/avidec.c
    	libavformat/bink.c
    	libavformat/cafdec.c
    	libavformat/flvdec.c
    	libavformat/id3v2.c
    	libavformat/isom.c
    	libavformat/matroskadec.c
    	libavformat/mov.c
    	libavformat/mpc.c
    	libavformat/mpc8.c
    	libavformat/mpegts.c
    	libavformat/mvi.c
    	libavformat/mxfdec.c
    	libavformat/mxg.c
    	libavformat/nutdec.c
    	libavformat/oggdec.c
    	libavformat/oggparsecelt.c
    	libavformat/oggparseflac.c
    	libavformat/oggparseopus.c
    	libavformat/oggparsespeex.c
    	libavformat/omadec.c
    	libavformat/rawdec.c
    	libavformat/riffdec.c
    	libavformat/rl2.c
    	libavformat/rmdec.c
    	libavformat/rtpdec_latm.c
    	libavformat/rtpdec_mpeg4.c
    	libavformat/rtpdec_qdm2.c
    	libavformat/rtpdec_svq3.c
    	libavformat/sierravmd.c
    	libavformat/smacker.c
    	libavformat/smush.c
    	libavformat/spdifenc.c
    	libavformat/takdec.c
    	libavformat/tta.c
    	libavformat/utils.c
    	libavformat/vqf.c
    	libavformat/westwood_vqa.c
    	libavformat/xmv.c
    	libavformat/xwma.c
    	libavformat/yop.c
    Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    29d147c9
Name
Last commit
Last update
..
Makefile Loading commit data...
ac3dsp.asm Loading commit data...
ac3dsp_init.c Loading commit data...
audiodsp.asm Loading commit data...
audiodsp_init.c Loading commit data...
blockdsp.asm Loading commit data...
blockdsp_init.c Loading commit data...
bswapdsp.asm Loading commit data...
bswapdsp_init.c Loading commit data...
cabac.h Loading commit data...
cavsdsp.c Loading commit data...
constants.c Loading commit data...
constants.h Loading commit data...
dcadsp.asm Loading commit data...
dcadsp_init.c Loading commit data...
dct-test.c Loading commit data...
dct32.asm Loading commit data...
dct_init.c Loading commit data...
deinterlace.asm Loading commit data...
dirac_dwt.c Loading commit data...
dirac_dwt.h Loading commit data...
diracdsp_mmx.c Loading commit data...
diracdsp_mmx.h Loading commit data...
diracdsp_yasm.asm Loading commit data...
dnxhdenc.asm Loading commit data...
dnxhdenc_init.c Loading commit data...
dwt_yasm.asm Loading commit data...
fdct.c Loading commit data...
fdct.h Loading commit data...
fdctdsp_init.c Loading commit data...
fft.asm Loading commit data...
fft.h Loading commit data...
fft_init.c Loading commit data...
flac_dsp_gpl.asm Loading commit data...
flacdsp.asm Loading commit data...
flacdsp_init.c Loading commit data...
fmtconvert.asm Loading commit data...
fmtconvert_init.c Loading commit data...
fpel.asm Loading commit data...
fpel.h Loading commit data...
g722dsp.asm Loading commit data...
g722dsp_init.c Loading commit data...
h263_loopfilter.asm Loading commit data...
h263dsp_init.c Loading commit data...
h264_chromamc.asm Loading commit data...
h264_chromamc_10bit.asm Loading commit data...
h264_deblock.asm Loading commit data...
h264_deblock_10bit.asm Loading commit data...
h264_i386.h Loading commit data...
h264_idct.asm Loading commit data...
h264_idct_10bit.asm Loading commit data...
h264_intrapred.asm Loading commit data...
h264_intrapred_10bit.asm Loading commit data...
h264_intrapred_init.c Loading commit data...
h264_qpel.c Loading commit data...
h264_qpel_10bit.asm Loading commit data...
h264_qpel_8bit.asm Loading commit data...
h264_weight.asm Loading commit data...
h264_weight_10bit.asm Loading commit data...
h264chroma_init.c Loading commit data...
h264dsp_init.c Loading commit data...
hevc_deblock.asm Loading commit data...
hevc_idct.asm Loading commit data...
hevc_mc.asm Loading commit data...
hevc_res_add.asm Loading commit data...
hevc_sao.asm Loading commit data...
hevcdsp.h Loading commit data...
hevcdsp_init.c Loading commit data...
hpeldsp.asm Loading commit data...
hpeldsp.h Loading commit data...
hpeldsp_init.c Loading commit data...
hpeldsp_rnd_template.c Loading commit data...
huffyuvdsp.asm Loading commit data...
huffyuvdsp_init.c Loading commit data...
huffyuvencdsp_mmx.c Loading commit data...
idctdsp.asm Loading commit data...
idctdsp.h Loading commit data...
idctdsp_init.c Loading commit data...
imdct36.asm Loading commit data...
inline_asm.h Loading commit data...
jpeg2000dsp.asm Loading commit data...
jpeg2000dsp_init.c Loading commit data...
lossless_audiodsp.asm Loading commit data...
lossless_audiodsp_init.c Loading commit data...
lossless_videodsp.asm Loading commit data...
lossless_videodsp_init.c Loading commit data...
lpc.c Loading commit data...
mathops.h Loading commit data...
me_cmp.asm Loading commit data...
me_cmp_init.c Loading commit data...
mlpdsp.asm Loading commit data...
mlpdsp_init.c Loading commit data...
mpegaudiodsp.c Loading commit data...
mpegvideo.c Loading commit data...
mpegvideodsp.c Loading commit data...
mpegvideoenc.c Loading commit data...
mpegvideoenc_qns_template.c Loading commit data...
mpegvideoenc_template.c Loading commit data...
mpegvideoencdsp.asm Loading commit data...
mpegvideoencdsp_init.c Loading commit data...
pixblockdsp.asm Loading commit data...
pixblockdsp_init.c Loading commit data...
pngdsp.asm Loading commit data...
pngdsp_init.c Loading commit data...
proresdsp.asm Loading commit data...
proresdsp_init.c Loading commit data...
qpel.asm Loading commit data...
qpeldsp.asm Loading commit data...
qpeldsp_init.c Loading commit data...
rnd_template.c Loading commit data...
rv34dsp.asm Loading commit data...
rv34dsp_init.c Loading commit data...
rv40dsp.asm Loading commit data...
rv40dsp_init.c Loading commit data...
sbrdsp.asm Loading commit data...
sbrdsp_init.c Loading commit data...
simple_idct.c Loading commit data...
simple_idct.h Loading commit data...
snowdsp.c Loading commit data...
svq1enc.asm Loading commit data...
svq1enc_init.c Loading commit data...
ttadsp.asm Loading commit data...
ttadsp_init.c Loading commit data...
v210-init.c Loading commit data...
v210.asm Loading commit data...
v210enc.asm Loading commit data...
v210enc_init.c Loading commit data...
vc1dsp.asm Loading commit data...
vc1dsp.h Loading commit data...
vc1dsp_init.c Loading commit data...
vc1dsp_mmx.c Loading commit data...
videodsp.asm Loading commit data...
videodsp_init.c Loading commit data...
vorbisdsp.asm Loading commit data...
vorbisdsp_init.c Loading commit data...
vp3dsp.asm Loading commit data...
vp3dsp_init.c Loading commit data...
vp56_arith.h Loading commit data...
vp6dsp.asm Loading commit data...
vp6dsp_init.c Loading commit data...
vp8dsp.asm Loading commit data...
vp8dsp_init.c Loading commit data...
vp8dsp_loopfilter.asm Loading commit data...
vp9dsp_init.c Loading commit data...
vp9intrapred.asm Loading commit data...
vp9itxfm.asm Loading commit data...
vp9lpf.asm Loading commit data...
vp9mc.asm Loading commit data...
w64xmmtest.c Loading commit data...
xvididct.asm Loading commit data...
xvididct.h Loading commit data...
xvididct_init.c Loading commit data...