Michael Niedermayer
e13d5e9a4b
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
..
2012-10-08 11:22:42 +02:00
2012-11-12 11:32:11 +01:00
2012-11-13 12:15:27 +01:00
2012-11-04 10:52:43 +01:00
2011-05-11 13:43:30 +02:00
2012-02-25 04:00:43 +01:00
2012-02-09 12:26:45 +01:00
2011-12-15 18:38:04 +01:00
2012-08-08 23:43:36 +02:00
2012-08-30 17:28:21 +02:00
2012-11-02 18:28:56 +01:00
2012-10-27 15:02:35 +02:00
2012-11-13 12:15:23 +01:00
2011-12-21 19:59:45 +01:00
2012-08-22 01:03:48 +02:00
2012-11-08 21:05:10 +01:00
2012-09-29 19:27:01 +02:00
2012-09-29 19:27:01 +02:00
2012-11-03 11:01:48 +01:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-10-05 23:58:18 +02:00
2012-09-30 12:22:19 +02:00
2012-02-10 01:20:07 +01:00
2012-11-06 11:35:14 +01:00
2012-09-18 09:06:44 +02:00
2012-11-13 13:21:21 +00:00
2012-11-05 17:31:22 +00:00
2012-11-11 20:43:28 +01:00
2011-11-23 23:03:37 +01:00
2012-11-13 19:44:21 +01:00
2011-09-02 23:08:03 +02:00
2012-11-11 11:15:53 +01:00
2012-11-11 11:15:53 +01:00
2012-11-11 11:15:53 +01:00
2012-11-11 14:06:27 +01:00
2011-03-17 17:26:45 +01:00
2012-09-05 20:09:56 +02:00
2011-03-17 17:26:45 +01:00
2012-11-14 11:59:20 +01:00
2012-10-30 13:52:03 +01:00
2012-10-31 14:02:35 +01:00
2012-07-22 10:31:33 +02:00
2012-11-01 22:47:50 +02:00
2012-04-23 18:14:25 +02:00
2012-09-15 16:26:00 +02:00
2012-10-06 13:55:18 +02:00
2011-12-12 01:25:37 +01:00
2012-10-02 09:43:27 +02:00
2012-10-31 00:37:42 +01:00
2012-10-29 11:56:15 +01:00
2012-10-09 13:06:04 +02:00
2012-10-24 23:33:47 +02:00
2012-02-09 12:26:45 +01:00