1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Michael Niedermayer 976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
..
amv
2011-06-30 09:47:32 +01:00
caf
crc
2011-07-03 17:17:54 +01:00
dpx
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-01-22 03:08:21 +00:00
md5
2011-07-03 18:19:18 +01:00
2010-08-31 11:13:14 +00:00
2010-07-17 10:50:25 +00:00
2010-04-19 11:51:40 +00:00
2010-07-11 12:44:32 +00:00
ptx
rl2
sha
2010-08-31 20:07:38 +00:00
smc
2011-01-14 22:32:26 +00:00
2010-12-28 23:52:53 +00:00
tmv
vp3
2010-08-25 17:23:38 +00:00
vp5
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
w64
2011-03-22 11:07:46 +00:00
2010-08-28 14:51:51 +00:00
yop
2010-07-11 00:07:31 +00:00