-
- Downloads
Merge commit '7c6eb0a1'
* 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:Michael Niedermayer <michael@niedermayer.cc>
Showing
- doc/examples/decoding_encoding.c 1 addition, 1 deletiondoc/examples/decoding_encoding.c
- doc/examples/muxing.c 1 addition, 1 deletiondoc/examples/muxing.c
- doc/examples/remuxing.c 1 addition, 1 deletiondoc/examples/remuxing.c
- doc/examples/transcode_aac.c 1 addition, 1 deletiondoc/examples/transcode_aac.c
- doc/examples/transcoding.c 1 addition, 1 deletiondoc/examples/transcoding.c
- ffmpeg.c 6 additions, 6 deletionsffmpeg.c
- ffmpeg_filter.c 1 addition, 1 deletionffmpeg_filter.c
- ffmpeg_opt.c 7 additions, 7 deletionsffmpeg_opt.c
- ffplay.c 2 additions, 1 deletionffplay.c
- libavcodec/4xm.c 1 addition, 1 deletionlibavcodec/4xm.c
- libavcodec/aacdec_template.c 2 additions, 2 deletionslibavcodec/aacdec_template.c
- libavcodec/aacenc.c 3 additions, 3 deletionslibavcodec/aacenc.c
- libavcodec/aacpsy.c 1 addition, 1 deletionlibavcodec/aacpsy.c
- libavcodec/ac3dec.c 3 additions, 3 deletionslibavcodec/ac3dec.c
- libavcodec/ac3enc.c 1 addition, 1 deletionlibavcodec/ac3enc.c
- libavcodec/ac3enc_float.c 1 addition, 1 deletionlibavcodec/ac3enc_float.c
- libavcodec/arm/idctdsp_init_arm.c 1 addition, 1 deletionlibavcodec/arm/idctdsp_init_arm.c
- libavcodec/arm/idctdsp_init_armv6.c 1 addition, 1 deletionlibavcodec/arm/idctdsp_init_armv6.c
- libavcodec/ass.c 1 addition, 1 deletionlibavcodec/ass.c
- libavcodec/asvdec.c 1 addition, 1 deletionlibavcodec/asvdec.c
Loading
Please register or sign in to comment