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
..
2015-07-26 02:50:50 -03:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-07-26 21:54:13 +00:00
2015-04-08 13:05:06 +00:00
2015-07-20 09:59:59 +00:00
2015-04-08 13:05:06 +00:00
2015-05-12 12:04:09 +00:00
2015-07-17 21:13:56 +02:00
2015-04-08 13:05:06 +00:00
2015-05-20 19:14:11 +02:00
2015-07-20 00:05:20 -03:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-07-02 15:36:00 +00:00
2015-07-23 11:57:45 +02:00
2015-04-11 20:39:43 +00:00
2015-07-17 11:29:29 +00:00
2015-04-08 13:05:06 +00:00
2015-07-18 10:45:29 +02:00
2015-04-08 13:05:06 +00:00
2015-07-17 00:18:29 +02:00
2015-07-19 16:05:33 +02:00
2015-07-25 22:07:20 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-03-02 04:08:22 +01:00
2015-04-08 13:05:06 +00:00
2015-07-26 21:54:13 +00:00
2015-04-08 13:05:06 +00:00
2015-03-02 04:08:18 +01:00
2015-05-12 20:31:21 +02:00
2015-03-02 04:08:14 +01:00
2015-07-03 18:43:21 +00:00
2015-03-18 12:19:08 +01:00
2015-04-19 12:41:59 +01:00
2015-05-19 18:56:40 +01:00
2015-05-18 13:22:27 +02:00
2015-05-17 00:22:09 +02:00
2015-04-22 12:26:53 +02:00
2015-06-13 21:33:18 +02:00
2015-07-03 18:43:21 +00:00
2015-03-07 02:45:49 +01:00
2015-07-24 02:09:53 +00:00
2015-03-16 23:43:12 +01:00
2015-03-16 10:49:25 +01:00
2015-04-19 23:45:35 +01:00
2015-06-20 19:51:14 +02:00
2015-03-16 23:43:12 +01:00
2015-07-15 13:09:41 +02:00
2015-04-30 03:48:33 +02:00
2015-07-26 21:54:13 +00:00
2015-07-14 17:57:14 +02:00
2015-07-14 23:50:50 +00:00
2015-04-20 03:19:47 +02:00
2015-07-14 05:07:07 +02:00
2015-03-30 00:08:57 +02:00
2015-07-26 21:54:13 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-07-18 05:01:16 +00:00
2015-04-08 13:05:06 +00:00
2015-06-07 20:18:15 +02:00
2015-03-16 23:43:12 +01:00
2015-04-08 13:05:06 +00:00
2015-06-14 01:04:14 +02:00
2015-04-08 13:05:06 +00:00
2015-07-08 05:40:03 +00:00
2015-07-02 15:36:00 +00:00
2015-07-21 19:19:36 +02:00
2015-05-04 17:50:16 +02:00
2015-03-16 23:43:12 +01:00
2015-03-16 23:43:12 +01:00
2015-07-22 15:52:02 +00:00
2015-03-16 23:43:12 +01:00
2015-03-16 23:43:12 +01:00
2015-03-16 23:43:12 +01:00
2015-04-08 13:05:06 +00:00
2015-03-16 23:43:12 +01:00
2015-04-21 20:20:58 +02:00
2015-03-16 23:43:12 +01:00
2015-03-18 01:18:40 +01:00
2015-07-16 18:50:24 +02:00
2015-03-20 09:41:32 +01:00
2015-07-01 17:19:52 +00:00
2015-05-31 04:31:28 +02:00
2015-05-12 20:08:18 +02:00
2015-03-17 16:52:10 +01:00
2015-03-17 17:11:42 +01:00
2015-04-20 03:19:47 +02:00
2015-07-02 15:36:00 +00:00
2015-04-08 13:05:06 +00:00
2015-07-02 15:36:00 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-06-13 20:51:43 +02:00
2015-03-16 23:43:12 +01:00
2015-04-08 13:05:06 +00:00
2015-03-18 01:18:40 +01:00
2015-04-08 13:05:06 +00:00
2015-05-27 05:18:55 +02:00
2015-03-16 23:43:12 +01:00
2015-03-16 23:43:12 +01:00
2015-03-16 23:43:12 +01:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-03-16 23:43:12 +01:00
2015-05-02 15:13:30 +02:00
2015-06-13 20:51:43 +02:00
2015-07-03 16:58:56 +00:00
2015-07-27 22:10:35 +02:00
2015-07-02 15:36:00 +00:00
2015-07-15 13:21:47 +00:00
2015-04-08 13:05:06 +00:00
2015-03-20 19:11:58 +01:00
2015-06-07 20:18:15 +02:00
2015-05-05 16:27:24 +02:00
2015-03-15 19:09:20 +01:00
2015-03-05 16:04:20 +01:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-07-14 17:57:14 +02:00
2015-04-08 13:05:06 +00:00
2015-04-21 22:54:13 +02:00
2015-07-19 19:01:00 +00:00
2015-07-14 23:50:50 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-07-21 18:20:22 +02:00
2015-03-22 17:30:24 +01:00
2015-03-04 21:43:42 +01:00
2015-07-02 15:36:00 +00:00
2015-04-08 13:05:06 +00:00
2015-07-15 13:34:56 +00:00
2015-04-08 13:05:06 +00:00
2015-07-14 13:29:55 +02:00
2015-07-12 20:05:56 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-06-04 17:03:29 +02:00
2015-06-30 16:02:09 +02:00
2015-04-08 13:05:06 +00:00
2015-07-27 22:10:35 +02:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-06-07 20:18:15 +02:00
2015-07-12 20:06:03 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-06-12 17:15:20 +00:00
2015-04-08 13:05:06 +00:00
2015-04-09 11:40:44 +02:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-08 13:05:06 +00:00
2015-04-05 15:46:11 +02:00