Michael Niedermayer
94d68a41fa
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
* 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>
2015-07-27 22:10:35 +02:00
..
2014-06-22 17:58:28 +02:00
2014-06-22 17:58:28 +02:00
2014-06-22 17:58:28 +02:00
2014-06-22 17:58:28 +02:00
2014-07-21 13:33:51 +02:00
2014-12-09 11:58:13 +01:00
2014-07-18 03:12:02 +02:00
2014-12-09 11:58:13 +01:00
2014-12-09 11:58:13 +01:00
2015-05-17 02:08:58 +02:00
2015-02-28 23:58:29 +01:00
2015-02-28 23:58:29 +01:00
2015-02-16 02:16:29 +01:00
2015-02-16 02:16:29 +01:00
2014-06-23 20:35:33 +02:00
2015-01-31 10:05:24 +01:00
2015-07-18 02:13:22 +02:00
2014-07-25 13:05:08 +02:00
2015-03-12 20:01:01 +01:00
2015-02-16 13:27:41 +01:00
2015-02-25 02:30:35 +01:00
2015-03-12 20:01:01 +01:00
2015-03-12 20:01:01 +01:00
2015-02-25 18:39:51 +01:00
2014-07-21 01:56:22 +02:00
2014-07-01 15:22:11 +02:00
2014-09-24 21:43:19 -03:00
2014-07-01 15:22:11 +02:00
2015-07-27 22:10:35 +02:00
2014-07-21 01:56:22 +02:00
2015-07-27 22:10:35 +02:00
2014-09-24 21:43:19 -03:00
2014-07-01 15:22:11 +02:00
2015-07-17 23:04:47 +02:00
2014-07-18 01:34:08 +03:00
2014-07-17 23:27:40 +02:00
2014-11-24 12:13:00 +01:00
2014-12-10 00:51:26 +01:00
2014-08-15 20:11:56 +02:00
2014-08-15 20:11:56 +02:00
2014-08-15 20:11:56 +02:00
2014-07-07 15:36:58 +02:00
2014-07-07 15:36:58 +02:00
2014-07-10 01:22:14 +02:00
2014-08-06 15:50:54 +02:00
2014-07-25 13:05:08 +02:00
2014-08-04 22:22:54 +02:00
2014-08-05 12:46:10 +02:00
2014-07-18 13:17:29 +02:00
2014-09-23 21:11:05 +02:00
2015-07-20 23:10:29 +02:00