mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
94d68a41fa
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': 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: Michael Niedermayer <michael@niedermayer.cc> |
||
|---|---|---|
| .. | ||
| aac.h | ||
| aacpsdsp_init_arm.c | ||
| aacpsdsp_neon.S | ||
| ac3dsp_arm.S | ||
| ac3dsp_armv6.S | ||
| ac3dsp_init_arm.c | ||
| ac3dsp_neon.S | ||
| asm-offsets.h | ||
| audiodsp_arm.h | ||
| audiodsp_init_arm.c | ||
| audiodsp_init_neon.c | ||
| audiodsp_neon.S | ||
| blockdsp_arm.h | ||
| blockdsp_init_arm.c | ||
| blockdsp_init_neon.c | ||
| blockdsp_neon.S | ||
| cabac.h | ||
| dca.h | ||
| dcadsp_init_arm.c | ||
| dcadsp_neon.S | ||
| dcadsp_vfp.S | ||
| dct-test.c | ||
| fft_fixed_init_arm.c | ||
| fft_fixed_neon.S | ||
| fft_init_arm.c | ||
| fft_neon.S | ||
| fft_vfp.S | ||
| flacdsp_arm.S | ||
| flacdsp_init_arm.c | ||
| fmtconvert_init_arm.c | ||
| fmtconvert_neon.S | ||
| fmtconvert_vfp.S | ||
| g722dsp_init_arm.c | ||
| g722dsp_neon.S | ||
| h264chroma_init_arm.c | ||
| h264cmc_neon.S | ||
| h264dsp_init_arm.c | ||
| h264dsp_neon.S | ||
| h264idct_neon.S | ||
| h264pred_init_arm.c | ||
| h264pred_neon.S | ||
| h264qpel_init_arm.c | ||
| h264qpel_neon.S | ||
| hevcdsp_arm.h | ||
| hevcdsp_deblock_neon.S | ||
| hevcdsp_idct_neon.S | ||
| hevcdsp_init_arm.c | ||
| hevcdsp_init_neon.c | ||
| hevcdsp_qpel_neon.S | ||
| hpeldsp_arm.h | ||
| hpeldsp_arm.S | ||
| hpeldsp_armv6.S | ||
| hpeldsp_init_arm.c | ||
| hpeldsp_init_armv6.c | ||
| hpeldsp_init_neon.c | ||
| hpeldsp_neon.S | ||
| idct.h | ||
| idctdsp_arm.h | ||
| idctdsp_arm.S | ||
| idctdsp_armv6.S | ||
| idctdsp_init_arm.c | ||
| idctdsp_init_armv5te.c | ||
| idctdsp_init_armv6.c | ||
| idctdsp_init_neon.c | ||
| idctdsp_neon.S | ||
| int_neon.S | ||
| jrevdct_arm.S | ||
| lossless_audiodsp_init_arm.c | ||
| lossless_audiodsp_neon.S | ||
| Makefile | ||
| mathops.h | ||
| mdct_fixed_neon.S | ||
| mdct_neon.S | ||
| mdct_vfp.S | ||
| me_cmp_armv6.S | ||
| me_cmp_init_arm.c | ||
| mlpdsp_armv5te.S | ||
| mlpdsp_armv6.S | ||
| mlpdsp_init_arm.c | ||
| mpegaudiodsp_fixed_armv6.S | ||
| mpegaudiodsp_init_arm.c | ||
| mpegvideo_arm.c | ||
| mpegvideo_arm.h | ||
| mpegvideo_armv5te_s.S | ||
| mpegvideo_armv5te.c | ||
| mpegvideo_neon.S | ||
| mpegvideoencdsp_armv6.S | ||
| mpegvideoencdsp_init_arm.c | ||
| neon.S | ||
| neontest.c | ||
| pixblockdsp_armv6.S | ||
| pixblockdsp_init_arm.c | ||
| rdft_neon.S | ||
| rv34dsp_init_arm.c | ||
| rv34dsp_neon.S | ||
| rv40dsp_init_arm.c | ||
| rv40dsp_neon.S | ||
| sbrdsp_init_arm.c | ||
| sbrdsp_neon.S | ||
| simple_idct_arm.S | ||
| simple_idct_armv5te.S | ||
| simple_idct_armv6.S | ||
| simple_idct_neon.S | ||
| startcode_armv6.S | ||
| startcode.h | ||
| synth_filter_neon.S | ||
| synth_filter_vfp.S | ||
| vc1dsp_init_arm.c | ||
| vc1dsp_init_neon.c | ||
| vc1dsp_neon.S | ||
| vc1dsp.h | ||
| videodsp_arm.h | ||
| videodsp_armv5te.S | ||
| videodsp_init_arm.c | ||
| videodsp_init_armv5te.c | ||
| vorbisdsp_init_arm.c | ||
| vorbisdsp_neon.S | ||
| vp3dsp_init_arm.c | ||
| vp3dsp_neon.S | ||
| vp6dsp_init_arm.c | ||
| vp6dsp_neon.S | ||
| vp8_armv6.S | ||
| vp8.h | ||
| vp8dsp_armv6.S | ||
| vp8dsp_init_arm.c | ||
| vp8dsp_init_armv6.c | ||
| vp8dsp_init_neon.c | ||
| vp8dsp_neon.S | ||
| vp8dsp.h | ||
| vp56_arith.h | ||