ffmpeg/libavformat
Michael Niedermayer be315a3232 Merge remote branch 'qatar/master'
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-30 01:58:26 +02:00
..
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-25 02:29:09 +02:00
2011-04-17 23:43:54 +02:00
2011-04-21 03:37:05 +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-04-26 04:21:15 +02:00
2011-04-04 02:15:12 +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-04-20 04:48:23 +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-04-04 02:15:12 +02:00
2011-04-21 03:37:05 +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-04-20 04:48:23 +02:00
2011-04-17 23:43:54 +02:00
2011-04-28 10:47:00 +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-20 04:48:23 +02:00
2011-04-28 10:47:40 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-30 01:58:26 +02:00
2011-04-29 04:29:21 +02:00
2011-04-29 04:29:21 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 02:15:12 +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-04-25 00:44:48 +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-04-05 02:31:56 +02:00
2011-04-24 03:41:22 +02:00
2011-04-20 04:48:23 +02:00
2011-04-24 03:41:22 +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-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-21 03:37:05 +02:00
2011-04-14 03:21:38 +02:00
2011-04-24 03:41:22 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00