1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer f211d9d839 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
	Makefile
	ffplay.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-27 03:32:45 +02:00
..
2011-06-21 03:06:54 +02:00
2011-06-26 13:29:17 +02:00
2011-06-15 10:58:25 +02:00
2011-06-10 22:13:26 +02:00
2011-06-19 03:54:15 +02:00
2011-06-15 10:57:26 +02:00
2011-06-21 04:45:29 +02:00
2011-06-15 01:16:58 +02:00
2011-06-20 21:03:59 +02:00
2011-06-21 22:18:59 +02:00
2011-06-21 13:17:10 +02:00