Michael Niedermayer
ac627b3d38
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'
* commit '716d413c13981da15323c7a3821860536eefdbbb':
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Conflicts:
doc/examples/muxing.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/aura.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/bfi.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dpx.c
libavcodec/dpxenc.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flashsv.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/iff.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kmvc.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/ljpegenc.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/motionpixels.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo_enc.c
libavcodec/pamenc.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrleenc.c
libavcodec/raw.c
libavcodec/rawdec.c
libavcodec/rl2.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/targaenc.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/tmv.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/vb.c
libavcodec/vp3.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/xwddec.c
libavcodec/xwdenc.c
libavcodec/yop.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_hflip.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/movenc.c
libavformat/mxf.h
libavformat/utils.c
libavformat/yuv4mpeg.c
libavutil/imgutils.c
libavutil/pixdesc.c
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 21:06:57 +02:00
..
2012-10-03 13:35:02 +02:00
2012-07-11 04:04:29 +02:00
2012-09-24 13:41:48 +02:00
2012-10-05 17:04:15 +02:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2012-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-04-20 09:43:11 -04:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2011-05-22 04:53:19 +02:00
2012-08-16 16:20:30 +02:00
2011-12-13 00:39:48 +01:00
2012-09-19 19:49:24 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-10-04 12:30:25 +02:00
2012-07-04 23:23:17 +02:00
2012-09-15 19:47:10 -04:00
2012-07-31 13:15:43 +02:00
2011-12-13 00:39:48 +01:00
2012-08-13 14:38:43 +02:00
2012-09-05 14:09:09 +02:00
2012-10-01 16:41:37 +02:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-09-19 21:57:58 +02:00
2011-09-21 21:25:43 +02:00
2012-08-16 16:20:30 +02:00
2012-10-06 13:45:08 +02:00
2012-09-16 02:53:32 +02:00
2012-08-15 22:32:06 +03:00
2012-08-16 16:20:30 +02:00
2011-12-12 01:25:37 +01:00
2012-05-15 18:08:32 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-10-08 21:06:57 +02:00
2012-10-08 21:06:57 +02:00
2012-08-09 01:44:15 +02:00
2011-06-28 13:14:46 +02:00
2012-10-04 12:30:25 +02:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2012-07-02 14:05:40 +03:00
2012-08-22 14:29:10 +01:00
2012-09-04 21:45:13 +02:00
2011-06-08 05:25:28 +02:00
2012-10-01 10:24:28 +02:00
2012-10-06 13:45:08 +02:00
2012-06-09 02:51:02 +02:00
2012-07-11 23:57:11 +02:00
2011-07-12 01:42:32 +02:00
2012-08-16 16:20:30 +02:00
2012-07-07 01:41:55 +00:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-10-08 20:12:00 +02:00
2012-06-06 20:00:35 +02:00
2012-07-01 22:43:09 +02:00
2012-06-16 12:47:46 +02:00
2012-01-29 00:34:59 +01:00
2012-07-10 11:37:03 +03:00
2012-09-10 00:07:26 +01:00
2012-10-08 19:42:49 +02:00
2012-10-08 21:06:57 +02:00
2012-09-30 10:23:08 +02:00
2012-10-07 11:28:38 +02:00
2012-09-06 00:40:01 +02:00
2012-10-06 14:03:15 +02:00
2011-06-29 23:49:03 +01:00
2012-10-08 21:06:57 +02:00
2012-10-08 21:06:57 +02:00
2012-10-08 21:06:57 +02:00
2012-06-22 22:48:00 +02:00
2012-09-08 17:30:10 +02:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2012-08-05 22:17:02 +02:00
2011-06-24 03:07:04 +02:00
2012-10-04 13:11:45 +02:00
2012-10-04 13:11:45 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-06-22 22:34:02 +02:00
2012-06-22 22:34:02 +02:00
2012-08-08 09:11:26 +02:00
2012-08-08 09:11:26 +02:00
2012-08-16 16:20:30 +02:00
2012-06-10 00:37:02 +02:00
2012-08-16 16:20:30 +02:00
2012-05-20 16:19:36 +02:00
2012-10-08 21:06:57 +02:00
2012-10-08 19:42:49 +02:00
2012-09-13 19:31:02 +02:00
2012-10-01 22:24:17 +02:00
2012-10-01 22:24:17 +02:00
2012-10-08 03:44:18 +02:00
2012-08-10 16:25:23 +02:00