ffmpeg/libavcodec
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-28 04:26:01 +02:00
2011-04-19 10:16:07 +02:00
2011-04-13 02:49:22 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-17 23:43:54 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-24 03:41:22 +02:00
2011-04-27 03:51:04 +02:00
2011-04-24 03:41:22 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-28 04:26:01 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-11 23:39:12 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-26 10:41:33 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 21:49:45 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-26 22:06:13 +02:00
2011-04-26 22:06:13 +02:00
2011-04-22 03:54:30 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-30 01:58:26 +02:00
2011-04-22 03:54:30 +02:00
2011-04-02 01:54:27 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-22 03:54:30 +02:00
2011-04-29 18:31:17 +02:00
2011-04-26 04:21:15 +02:00
2011-04-25 00:20:03 +02:00
2011-04-27 03:51:04 +02:00
2011-04-25 00:20:03 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-03 02:28:01 +02:00
2011-04-17 23:43:54 +02:00
2011-04-19 13:25:05 +02:00
2011-04-12 03:54:28 +02:00
2011-04-23 01:09:43 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-26 22:06:13 +02:00
2011-04-26 18:25:24 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-06 02:59:49 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-17 23:43:54 +02:00
2011-04-03 16:40:12 +02:00
2011-04-17 23:43:54 +02:00
2011-04-20 04:48:23 +02:00
2011-04-27 03:51:04 +02:00
2011-04-28 04:26:01 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-03-19 15:24:31 +00:00
2011-03-28 00:16:44 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 21:49:45 +02:00
2011-04-27 21:49:45 +02:00
2011-04-17 23:43:54 +02:00
2011-04-29 10:46:45 +02:00
2011-04-24 03:41:22 +02:00
2011-04-28 04:26:01 +02:00
2011-04-28 04:26:01 +02:00
2011-04-22 03:54:30 +02:00
2011-04-11 04:08:08 +02:00
2011-04-17 23:43:54 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-30 01:58:26 +02:00
2011-04-24 03:41:22 +02:00
2011-04-23 01:09:43 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-04-30 01:58:26 +02:00
2011-04-23 01:09:43 +02:00
2011-04-27 19:45:57 +02:00
2011-04-20 04:48:23 +02:00