Michael Niedermayer
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 23:15:19 +02:00
..
2015-07-27 23:15:19 +02:00
2014-08-18 19:48:18 +02:00
2014-07-29 21:12:07 +02:00
2015-07-18 04:52:49 +02:00
2015-07-12 15:22:37 +02:00
2014-08-08 00:48:38 +02:00
2015-02-14 21:07:40 +01:00
2015-07-27 15:24:59 +01:00
2015-01-16 14:20:37 +01:00
2015-07-27 15:24:59 +01:00
2015-02-14 21:07:40 +01:00
2015-07-18 01:46:50 +02:00
2014-08-08 00:48:38 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 15:24:59 +01:00
2015-04-07 22:50:07 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-07-15 22:52:06 +02:00
2014-08-08 00:48:38 +02:00
2015-07-02 04:58:27 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-06-28 13:36:54 +02:00
2015-04-19 12:41:59 +01:00
2015-04-16 21:09:32 +02:00
2014-08-08 00:48:38 +02:00
2014-05-05 16:46:47 +02:00
2015-07-25 02:26:01 +02:00
2014-06-18 17:28:10 +02:00
2015-06-08 22:37:41 +02:00
2015-07-27 23:15:19 +02:00
2014-09-25 00:09:42 +02:00
2015-06-16 21:48:51 +02:00
2015-07-27 23:15:19 +02:00
2015-05-29 00:04:41 +02:00
2015-06-01 00:43:50 +02:00
2015-06-29 16:30:43 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-04-17 20:03:16 +02:00
2014-08-15 21:00:50 +02:00
2014-10-29 22:47:11 +01:00
2014-08-08 00:48:38 +02:00
2015-07-27 15:24:59 +01:00
2014-08-08 00:48:38 +02:00
2015-02-26 23:19:39 +01:00
2015-02-11 02:47:54 +01:00
2015-07-12 12:17:40 +02:00
2015-02-14 21:07:40 +01:00
2015-03-06 21:35:00 +01:00
2015-07-27 23:15:19 +02:00
2014-05-30 07:26:18 +02:00
2015-03-16 15:40:10 +01:00
2014-07-11 01:04:04 +02:00
2014-12-31 22:33:51 +01:00
2014-11-13 15:31:19 +01:00
2014-09-25 13:45:30 +02:00
2015-07-17 00:12:04 +02:00
2015-02-14 21:07:40 +01:00
2014-10-26 03:22:52 +01:00
2015-05-11 01:56:11 +02:00
2014-08-08 00:48:38 +02:00
2014-07-03 21:42:16 +02:00
2014-08-30 15:50:22 +00:00
2015-05-26 00:29:36 +02:00
2014-04-19 04:25:01 +02:00
2014-08-08 00:48:38 +02:00
2015-02-26 02:06:10 +01:00
2015-07-27 23:15:19 +02:00
2014-08-08 00:48:38 +02:00
2015-07-22 21:04:17 +02:00
2015-03-26 03:10:27 +01:00
2015-03-15 13:45:31 +01:00
2014-12-04 20:24:00 +01:00
2015-07-12 15:22:37 +02:00
2015-02-14 21:07:40 +01:00
2015-06-25 12:45:09 +02:00
2014-06-18 14:55:28 +02:00
2015-07-27 22:10:35 +02:00
2015-07-27 22:10:35 +02:00
2014-09-24 19:17:55 +02:00
2015-06-22 12:46:18 +02:00
2015-02-14 21:07:40 +01:00
2015-02-14 21:07:40 +01:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2014-06-01 14:16:29 +02:00
2015-05-11 15:31:55 +02:00
2014-06-01 14:16:29 +02:00
2014-12-15 15:49:00 +01:00
2015-06-12 22:55:49 +02:00
2015-07-27 23:15:19 +02:00
2015-06-14 15:09:33 +02:00
2015-04-25 03:43:59 +02:00
2014-06-15 18:07:03 +02:00
2014-06-18 19:49:17 +02:00
2015-04-03 00:10:09 +02:00
2015-02-14 21:07:40 +01:00
2015-03-29 12:31:00 +02:00
2015-02-14 21:07:40 +01:00
2015-02-14 21:07:40 +01:00
2015-02-20 20:14:56 +01:00
2014-05-07 03:42:21 +02:00
2015-05-30 03:57:20 +02:00
2015-06-08 00:35:43 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-07-26 22:06:19 +02:00
2015-01-23 22:27:48 +01:00
2014-04-16 01:37:38 +02:00
2015-06-10 18:17:28 +02:00
2014-10-20 04:31:46 +02:00
2015-04-06 14:44:33 +02:00
2014-11-15 11:30:42 +01:00
2014-04-16 19:41:41 +02:00
2014-08-28 14:34:55 +02:00
2015-01-05 20:52:51 +01:00
2015-07-27 23:15:19 +02:00
2014-04-19 04:25:01 +02:00
2014-07-04 00:50:40 +02:00
2015-05-12 18:40:16 +02:00
2014-08-24 11:05:42 +00:00
2015-07-27 23:15:19 +02:00
2014-09-11 15:34:13 +02:00
2014-09-11 15:16:24 +02:00
2015-06-22 23:34:56 +02:00
2015-05-12 13:32:23 +02:00
2015-06-29 16:25:11 +02:00
2015-02-14 21:07:40 +01:00
2015-07-27 23:15:19 +02:00
2015-07-26 04:00:02 +02:00
2015-05-26 19:54:41 +02:00
2015-07-27 15:24:59 +01:00
2015-07-19 20:28:39 +02:00
2015-02-14 21:07:40 +01:00
2015-07-12 13:56:50 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-02-14 21:07:40 +01:00
2014-08-11 14:29:56 +02:00
2014-08-29 18:57:25 +02:00
2015-06-13 09:28:41 +02:00
2015-05-31 19:04:52 +02:00
2015-01-23 17:45:35 +01:00
2015-06-24 00:25:24 +02:00
2015-06-24 00:44:09 +02:00
2014-09-25 13:51:43 +02:00
2014-05-04 00:19:35 +02:00
2014-07-13 19:18:31 +02:00
2014-07-13 19:18:31 +02:00
2014-08-08 00:48:38 +02:00
2014-08-15 22:47:45 +02:00
2014-08-08 00:48:38 +02:00
2015-02-14 21:07:40 +01:00
2014-10-17 12:51:49 +02:00
2015-07-21 15:19:42 +02:00
2015-04-08 12:36:53 +02:00
2015-04-08 12:36:53 +02:00
2015-07-27 23:15:19 +02:00
2015-07-09 19:52:06 +02:00
2014-07-16 22:50:24 +02:00
2014-08-08 00:48:38 +02:00
2015-04-08 20:58:25 +02:00
2015-07-12 15:22:37 +02:00
2015-02-14 21:07:40 +01:00
2015-02-14 21:07:40 +01:00
2015-03-22 03:52:37 +01:00
2015-04-20 03:19:47 +02:00
2015-04-20 03:19:47 +02:00
2015-05-31 13:05:12 +02:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-07-18 13:27:33 +02:00
2015-02-25 00:48:50 +01:00
2015-07-20 02:41:44 +02:00
2014-12-02 15:28:22 +00:00
2015-07-27 23:15:19 +02:00
2015-07-27 15:24:59 +01:00
2015-05-17 12:57:27 +02:00
2014-08-26 14:05:07 +02:00
2015-05-25 13:34:34 +02:00
2015-07-27 23:15:19 +02:00
2014-08-11 13:46:53 +02:00
2015-07-18 23:26:05 +02:00
2015-03-15 13:39:56 +01:00
2015-07-09 00:11:32 +02:00
2015-06-28 13:41:44 +02:00
2014-08-08 00:48:38 +02:00
2015-05-27 17:29:18 +02:00
2015-06-29 16:29:07 +02:00
2015-02-11 02:47:54 +01:00
2015-07-27 22:10:35 +02:00
2015-02-20 20:41:35 +01:00
2015-07-27 15:24:59 +01:00
2015-07-22 10:23:18 +02:00
2015-07-22 10:23:18 +02:00
2015-07-27 15:24:59 +01:00
2015-06-08 13:03:29 +02:00
2015-07-27 23:15:19 +02:00
2014-08-08 00:48:38 +02:00
2015-05-31 10:10:16 +03:00
2015-02-03 02:21:55 +01:00
2014-08-08 00:48:38 +02:00
2015-04-21 02:19:07 +02:00
2015-06-24 14:45:00 +01:00
2015-06-15 21:41:20 +02:00
2015-07-27 15:24:59 +01:00
2015-07-25 18:39:17 +02:00
2015-02-14 21:07:40 +01:00
2015-07-27 23:15:19 +02:00
2014-12-18 23:27:07 +01:00
2015-06-09 18:42:55 +02:00
2015-07-27 15:24:59 +01:00
2015-07-09 03:46:37 +02:00
2015-07-27 15:24:59 +01:00
2015-07-27 23:15:19 +02:00
2015-07-27 15:24:59 +01:00
2014-05-01 17:26:06 +02:00
2015-07-27 15:24:59 +01:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2014-12-19 04:36:45 +01:00
2015-07-27 15:24:59 +01:00
2014-06-18 17:28:10 +02:00
2015-04-22 22:27:05 +02:00
2015-07-03 21:02:50 +02:00
2014-12-22 12:03:34 +01:00
2014-12-20 00:49:47 +01:00
2015-02-14 21:07:40 +01:00
2015-02-11 02:47:54 +01:00
2014-05-22 15:15:04 +02:00
2014-08-08 00:48:38 +02:00
2014-08-08 00:48:38 +02:00
2014-08-24 11:05:42 +00:00
2015-02-14 21:07:40 +01:00
2015-06-21 09:30:01 +00:00
2015-04-20 03:19:47 +02:00
2015-07-27 15:24:59 +01:00
2015-01-05 01:45:49 +01:00
2015-06-21 12:16:24 +02:00
2015-07-27 23:15:19 +02:00
2014-10-29 01:32:44 +01:00
2015-07-27 23:15:19 +02:00
2015-01-27 18:16:42 +01:00
2014-04-17 21:45:58 +02:00
2015-06-15 21:18:13 +02:00
2015-07-12 15:22:37 +02:00
2015-07-27 15:24:59 +01:00
2015-06-04 17:03:34 +02:00
2015-07-27 15:24:59 +01:00
2014-12-06 00:48:47 +01:00
2015-07-27 23:15:19 +02:00
2015-06-07 21:55:46 +02:00
2015-02-06 16:07:16 +00:00
2014-12-20 00:17:43 +01:00
2014-06-18 17:28:10 +02:00
2015-05-29 11:32:07 +02:00
2015-06-01 11:29:05 +02:00
2015-06-01 11:29:05 +02:00
2015-01-15 14:45:29 +01:00
2014-06-01 23:56:22 +02:00
2015-07-01 20:03:26 +00:00
2015-02-25 00:58:39 +01:00
2015-02-25 00:03:52 +01:00
2015-06-08 23:05:01 +02:00
2015-02-25 00:58:39 +01:00
2015-03-05 10:05:44 +02:00
2015-02-25 00:58:39 +01:00
2015-02-25 00:58:39 +01:00
2015-02-24 22:34:08 +01:00
2015-07-27 23:15:19 +02:00
2015-07-27 23:15:19 +02:00
2015-02-24 23:44:25 +01:00
2015-03-31 01:11:02 +02:00
2015-07-27 23:15:19 +02:00
2015-03-04 11:31:55 +01:00
2015-07-27 15:24:59 +01:00
2015-02-24 22:34:08 +01:00
2015-02-25 00:58:39 +01:00
2015-02-24 22:55:20 +01:00
2015-07-27 15:24:59 +01:00
2015-07-27 23:15:19 +02:00
2015-07-27 15:24:59 +01:00
2015-02-25 00:58:39 +01:00
2015-03-11 20:28:45 +01:00
2015-07-27 23:15:19 +02:00
2015-04-20 03:19:47 +02:00
2015-02-25 00:58:39 +01:00
2015-03-01 01:31:49 +01:00
2015-03-01 01:31:49 +01:00
2015-02-25 00:48:50 +01:00
2014-12-19 13:25:51 +01:00
2014-09-22 03:45:34 +02:00
2015-02-24 23:30:51 +01:00
2015-07-20 00:27:52 +02:00
2015-03-10 11:17:37 +01:00
2015-03-01 01:31:49 +01:00
2015-06-03 22:39:27 +02:00
2015-02-24 23:30:51 +01:00
2015-04-11 18:53:54 +02:00
2015-05-15 20:21:37 +02:00
2015-04-01 21:34:20 +02:00
2014-10-21 03:51:14 +02:00
2015-05-27 21:48:47 +02:00
2014-10-21 03:52:27 +02:00
2014-10-29 01:32:44 +01:00
2014-10-24 19:23:23 +02:00
2015-01-09 13:39:48 +01:00
2015-06-02 16:42:33 +02:00
2015-06-08 22:35:53 +02:00
2015-07-27 22:10:35 +02:00
2015-04-23 12:56:31 +02:00
2015-06-24 14:45:09 +01:00
2015-06-12 22:10:47 +02:00
2015-07-27 15:24:59 +01:00
2015-03-09 21:05:29 +01:00
2015-07-27 15:24:59 +01:00
2014-08-08 00:48:38 +02:00
2015-02-14 21:07:40 +01:00
2015-07-27 15:24:59 +01:00
2014-11-24 13:10:16 +01:00
2015-02-14 21:07:40 +01:00
2014-08-08 00:48:38 +02:00
2015-07-27 23:15:19 +02:00
2014-10-29 01:32:44 +01:00
2014-09-30 20:21:14 +02:00
2014-12-18 19:59:03 +01:00
2014-10-22 23:12:38 +02:00
2015-05-11 12:42:38 +02:00
2015-05-11 12:42:38 +02:00
2014-08-08 00:48:38 +02:00
2014-08-08 00:48:38 +02:00
2014-09-26 10:35:14 +02:00
2014-06-18 19:49:17 +02:00
2015-07-08 12:06:17 +02:00
2015-05-24 13:32:53 +02:00
2015-07-27 23:15:19 +02:00
2015-04-09 20:58:11 +02:00
2015-02-17 00:05:51 +01:00
2015-01-09 13:40:09 +01:00
2015-02-06 09:42:53 +00:00
2014-10-07 13:46:29 +02:00
2015-06-14 21:40:08 +02:00
2015-05-27 22:24:00 +02:00
2015-06-09 01:06:32 +02:00
2015-06-08 14:08:52 +02:00
2015-06-08 14:08:52 +02:00
2014-08-08 00:48:38 +02:00
2015-07-27 15:24:59 +01:00
2015-02-14 21:07:40 +01:00
2014-08-08 00:48:38 +02:00
2015-06-22 10:47:29 +03:00
2015-04-09 20:58:11 +02:00
2015-05-11 03:50:01 +02:00
2015-06-22 12:46:08 +02:00
2015-07-27 23:15:19 +02:00
2014-08-08 00:48:38 +02:00
2015-07-17 00:12:04 +02:00
2014-08-08 00:48:38 +02:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00
2014-06-18 17:28:10 +02:00
2015-05-11 15:56:16 +02:00
2015-05-11 15:56:16 +02:00
2014-08-08 00:48:38 +02:00
2015-07-27 15:24:59 +01:00
2015-07-12 15:22:37 +02:00
2015-05-17 02:08:58 +02:00
2014-08-24 11:05:42 +00:00
2015-06-09 21:19:57 +02:00
2015-05-15 00:56:43 +02:00
2015-05-22 00:17:53 +02:00
2014-05-25 03:04:14 +02:00
2014-12-20 01:51:16 +01:00
2015-07-27 15:24:59 +01:00
2015-07-12 15:22:37 +02:00
2015-04-11 13:50:50 +02:00
2015-04-24 03:43:56 +02:00
2015-07-27 15:24:59 +01:00
2015-07-27 15:24:59 +01:00
2015-07-27 15:24:59 +01:00
2015-07-11 14:46:19 +02:00
2015-07-12 00:00:21 +02:00
2015-07-03 18:43:21 +00:00