ffmpeg/libavformat
Michael Niedermayer b4bcd1e2f1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
	ffpresets/libx264-fast.ffpreset
	ffpresets/libx264-fast_firstpass.ffpreset
	ffpresets/libx264-faster.ffpreset
	ffpresets/libx264-faster_firstpass.ffpreset
	ffpresets/libx264-medium.ffpreset
	ffpresets/libx264-medium_firstpass.ffpreset
	ffpresets/libx264-placebo.ffpreset
	ffpresets/libx264-placebo_firstpass.ffpreset
	ffpresets/libx264-slow.ffpreset
	ffpresets/libx264-slow_firstpass.ffpreset
	ffpresets/libx264-slower.ffpreset
	ffpresets/libx264-slower_firstpass.ffpreset
	ffpresets/libx264-superfast.ffpreset
	ffpresets/libx264-superfast_firstpass.ffpreset
	ffpresets/libx264-ultrafast.ffpreset
	ffpresets/libx264-ultrafast_firstpass.ffpreset
	ffpresets/libx264-veryfast.ffpreset
	ffpresets/libx264-veryfast_firstpass.ffpreset
	ffpresets/libx264-veryslow.ffpreset
	ffpresets/libx264-veryslow_firstpass.ffpreset
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-18 05:42:42 +02:00
..
2011-05-06 17:39:31 +02:00
2011-05-15 03:25:57 +02:00
2011-05-13 04:40:40 +02:00
2011-04-17 23:43:54 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-05-07 20:14:47 +02:00
2011-04-29 04:29:21 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-30 01:58:26 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-05-09 16:05:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-17 23:43:54 +02:00
2011-05-02 18:38:16 +02:00
2011-04-17 23:43:54 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-07 03:32:26 +02:00
2011-04-03 16:40:12 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 02:15:12 +02:00
2011-04-20 04:48:23 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 02:15:12 +02:00
2011-04-29 04:29:21 +02:00
2011-04-20 04:48:23 +02:00
2011-05-07 09:47:35 +02:00
2011-04-23 01:09:43 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-05-11 22:43:30 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-05 02:31:56 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-05-10 04:03:17 +02:00
2011-05-12 04:51:24 +02:00
2011-05-12 04:51:24 +02:00
2011-05-12 04:51:24 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-09 03:17:07 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-21 03:37:05 +02:00
2011-04-04 02:15:12 +02:00
2011-04-14 03:21:38 +02:00
2011-05-16 11:24:23 +02:00
2011-04-04 02:15:12 +02:00
2011-05-01 21:13:18 +02:00
2011-05-01 21:13:18 +02:00
2011-04-04 02:15:12 +02:00