• Michael Niedermayer's avatar
    Merge commit '7c6eb0a1' · 94d68a41
    Michael Niedermayer authored
    * commit '7c6eb0a1':
      lavc: AV-prefix all codec flags
    
    Conflicts:
    	doc/examples/muxing.c
    	ffmpeg.c
    	ffmpeg_opt.c
    	ffplay.c
    	libavcodec/aacdec.c
    	libavcodec/aacenc.c
    	libavcodec/ac3dec.c
    	libavcodec/ac3enc_float.c
    	libavcodec/atrac1.c
    	libavcodec/atrac3.c
    	libavcodec/atrac3plusdec.c
    	libavcodec/dcadec.c
    	libavcodec/ffv1enc.c
    	libavcodec/h264.c
    	libavcodec/h264_loopfilter.c
    	libavcodec/h264_mb.c
    	libavcodec/imc.c
    	libavcodec/libmp3lame.c
    	libavcodec/libtheoraenc.c
    	libavcodec/libtwolame.c
    	libavcodec/libvpxenc.c
    	libavcodec/libxavs.c
    	libavcodec/libxvid.c
    	libavcodec/mpeg12dec.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpegaudiodec_template.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/mpegvideo_motion.c
    	libavcodec/nellymoserdec.c
    	libavcodec/nellymoserenc.c
    	libavcodec/nvenc.c
    	libavcodec/on2avc.c
    	libavcodec/options_table.h
    	libavcodec/opus_celt.c
    	libavcodec/pngenc.c
    	libavcodec/ra288.c
    	libavcodec/ratecontrol.c
    	libavcodec/twinvq.c
    	libavcodec/vc1_block.c
    	libavcodec/vc1_loopfilter.c
    	libavcodec/vc1_mc.c
    	libavcodec/vc1dec.c
    	libavcodec/vorbisdec.c
    	libavcodec/vp3.c
    	libavcodec/wma.c
    	libavcodec/wmaprodec.c
    	libavcodec/x86/hpeldsp_init.c
    	libavcodec/x86/me_cmp_init.c
    Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    94d68a41
Name
Last commit
Last update
..
Makefile Loading commit data...
aac.h Loading commit data...
aacpsdsp_init_arm.c Loading commit data...
aacpsdsp_neon.S Loading commit data...
ac3dsp_arm.S Loading commit data...
ac3dsp_armv6.S Loading commit data...
ac3dsp_init_arm.c Loading commit data...
ac3dsp_neon.S Loading commit data...
asm-offsets.h Loading commit data...
audiodsp_arm.h Loading commit data...
audiodsp_init_arm.c Loading commit data...
audiodsp_init_neon.c Loading commit data...
audiodsp_neon.S Loading commit data...
blockdsp_arm.h Loading commit data...
blockdsp_init_arm.c Loading commit data...
blockdsp_init_neon.c Loading commit data...
blockdsp_neon.S Loading commit data...
cabac.h Loading commit data...
dca.h Loading commit data...
dcadsp_init_arm.c Loading commit data...
dcadsp_neon.S Loading commit data...
dcadsp_vfp.S Loading commit data...
dct-test.c Loading commit data...
fft_fixed_init_arm.c Loading commit data...
fft_fixed_neon.S Loading commit data...
fft_init_arm.c Loading commit data...
fft_neon.S Loading commit data...
fft_vfp.S Loading commit data...
flacdsp_arm.S Loading commit data...
flacdsp_init_arm.c Loading commit data...
fmtconvert_init_arm.c Loading commit data...
fmtconvert_neon.S Loading commit data...
fmtconvert_vfp.S Loading commit data...
g722dsp_init_arm.c Loading commit data...
g722dsp_neon.S Loading commit data...
h264chroma_init_arm.c Loading commit data...
h264cmc_neon.S Loading commit data...
h264dsp_init_arm.c Loading commit data...
h264dsp_neon.S Loading commit data...
h264idct_neon.S Loading commit data...
h264pred_init_arm.c Loading commit data...
h264pred_neon.S Loading commit data...
h264qpel_init_arm.c Loading commit data...
h264qpel_neon.S Loading commit data...
hevcdsp_arm.h Loading commit data...
hevcdsp_deblock_neon.S Loading commit data...
hevcdsp_idct_neon.S Loading commit data...
hevcdsp_init_arm.c Loading commit data...
hevcdsp_init_neon.c Loading commit data...
hevcdsp_qpel_neon.S Loading commit data...
hpeldsp_arm.S Loading commit data...
hpeldsp_arm.h Loading commit data...
hpeldsp_armv6.S Loading commit data...
hpeldsp_init_arm.c Loading commit data...
hpeldsp_init_armv6.c Loading commit data...
hpeldsp_init_neon.c Loading commit data...
hpeldsp_neon.S Loading commit data...
idct.h Loading commit data...
idctdsp_arm.S Loading commit data...
idctdsp_arm.h Loading commit data...
idctdsp_armv6.S Loading commit data...
idctdsp_init_arm.c Loading commit data...
idctdsp_init_armv5te.c Loading commit data...
idctdsp_init_armv6.c Loading commit data...
idctdsp_init_neon.c Loading commit data...
idctdsp_neon.S Loading commit data...
int_neon.S Loading commit data...
jrevdct_arm.S Loading commit data...
lossless_audiodsp_init_arm.c Loading commit data...
lossless_audiodsp_neon.S Loading commit data...
mathops.h Loading commit data...
mdct_fixed_neon.S Loading commit data...
mdct_neon.S Loading commit data...
mdct_vfp.S Loading commit data...
me_cmp_armv6.S Loading commit data...
me_cmp_init_arm.c Loading commit data...
mlpdsp_armv5te.S Loading commit data...
mlpdsp_armv6.S Loading commit data...
mlpdsp_init_arm.c Loading commit data...
mpegaudiodsp_fixed_armv6.S Loading commit data...
mpegaudiodsp_init_arm.c Loading commit data...
mpegvideo_arm.c Loading commit data...
mpegvideo_arm.h Loading commit data...
mpegvideo_armv5te.c Loading commit data...
mpegvideo_armv5te_s.S Loading commit data...
mpegvideo_neon.S Loading commit data...
mpegvideoencdsp_armv6.S Loading commit data...
mpegvideoencdsp_init_arm.c Loading commit data...
neon.S Loading commit data...
neontest.c Loading commit data...
pixblockdsp_armv6.S Loading commit data...
pixblockdsp_init_arm.c Loading commit data...
rdft_neon.S Loading commit data...
rv34dsp_init_arm.c Loading commit data...
rv34dsp_neon.S Loading commit data...
rv40dsp_init_arm.c Loading commit data...
rv40dsp_neon.S Loading commit data...
sbrdsp_init_arm.c Loading commit data...
sbrdsp_neon.S Loading commit data...
simple_idct_arm.S Loading commit data...
simple_idct_armv5te.S Loading commit data...
simple_idct_armv6.S Loading commit data...
simple_idct_neon.S Loading commit data...
startcode.h Loading commit data...
startcode_armv6.S Loading commit data...
synth_filter_neon.S Loading commit data...
synth_filter_vfp.S Loading commit data...
vc1dsp.h Loading commit data...
vc1dsp_init_arm.c Loading commit data...
vc1dsp_init_neon.c Loading commit data...
vc1dsp_neon.S Loading commit data...
videodsp_arm.h Loading commit data...
videodsp_armv5te.S Loading commit data...
videodsp_init_arm.c Loading commit data...
videodsp_init_armv5te.c Loading commit data...
vorbisdsp_init_arm.c Loading commit data...
vorbisdsp_neon.S Loading commit data...
vp3dsp_init_arm.c Loading commit data...
vp3dsp_neon.S Loading commit data...
vp56_arith.h Loading commit data...
vp6dsp_init_arm.c Loading commit data...
vp6dsp_neon.S Loading commit data...
vp8.h Loading commit data...
vp8_armv6.S Loading commit data...
vp8dsp.h Loading commit data...
vp8dsp_armv6.S Loading commit data...
vp8dsp_init_arm.c Loading commit data...
vp8dsp_init_armv6.c Loading commit data...
vp8dsp_init_neon.c Loading commit data...
vp8dsp_neon.S Loading commit data...