1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer a201639a01 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavutil/pixfmt.h
	libswscale/swscale_unscaled.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 17:47:36 +01:00
..
2012-10-26 01:52:40 +02:00
2012-10-22 23:22:39 +00:00
2012-09-28 02:40:53 +02:00
2012-10-19 21:46:39 +02:00
2012-10-26 15:34:25 +00:00
2012-10-18 00:55:03 +02:00
2012-10-26 03:12:45 +00:00
2012-10-10 15:50:32 +00:00
2012-10-08 09:03:19 +02:00
2012-10-19 23:21:41 +02:00
2012-10-19 23:00:47 +02:00
2012-10-19 23:24:03 +02:00
2012-10-24 22:15:31 +02:00
2012-10-27 02:06:21 +02:00
2012-10-28 15:10:28 +00:00
2012-10-25 20:57:40 +00:00
2012-10-25 00:24:25 +02:00
2012-10-29 22:11:21 +01:00
2012-10-07 23:31:27 +02:00
2012-10-20 20:20:39 +02:00
2012-10-14 04:01:41 +02:00
2012-10-28 14:50:11 +01:00
2012-10-26 16:18:09 +02:00
2012-10-13 18:47:18 +02:00
2012-10-16 20:03:37 +02:00
2012-10-13 14:15:58 +00:00
2012-10-27 23:03:07 +02:00
2012-10-10 13:09:26 +00:00
2012-10-15 08:12:25 +00:00
2012-10-26 03:12:45 +00:00
2012-10-14 10:41:16 +00:00