1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
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-29 21:13:50 +01:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-10-29 05:21:47 +01:00
2012-10-29 20:06:52 +00:00
2012-10-18 20:29:03 +02:00
2012-10-25 21:51:45 +00:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:02 +00:00
2012-10-27 02:06:21 +02:00
2012-10-18 21:42:04 +02:00
2012-10-14 21:45:42 +02:00
2012-10-25 01:38:15 +02:00
2012-10-29 20:06:52 +00:00
2012-10-15 15:09:46 +02:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-27 04:32:40 +02:00
2012-10-15 13:28:23 +00:00