Files
ffmpeg/libavcodec
Michael Niedermayer 31ab1575e5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: Convert some commented-out printf/av_log instances to av_dlog
  avcodec: Drop silly and/or broken printf debug output
  avcodec: Drop some silly commented-out av_log() invocations
  avformat: Convert some commented-out printf/av_log instances to av_dlog
  avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
  Remove some silly disabled code.
  ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

Conflicts:
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/mjpegdec.c
	libavcodec/motion_est_template.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/put_bits.h
	libavcodec/ratecontrol.c
	libavcodec/wmaenc.c
	libavdevice/timefilter.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/flvenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01 16:12:38 +02:00
..
2012-08-15 22:32:06 +03:00
2012-09-28 11:03:20 +02:00
2012-09-01 15:23:39 +02:00
2012-09-21 01:03:31 +02:00
2012-09-29 16:25:29 +02:00
2012-09-15 04:06:32 +02:00
2012-08-14 18:58:49 +02:00
2012-09-30 00:13:54 +02:00
2012-09-25 18:10:11 +02:00
2012-08-27 18:31:21 +02:00
2012-08-25 03:55:50 +02:00
2012-08-15 22:32:06 +03:00
2012-09-04 18:37:54 +03:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-09-30 14:05:04 +00:00
2012-08-13 04:58:15 +02:00
2012-10-01 10:24:28 +02:00
2012-09-26 01:56:01 +02:00
2012-09-03 23:26:14 +02:00
2012-09-03 23:23:40 +02:00
2012-09-15 22:13:21 +02:00
2012-09-23 21:12:23 +02:00
2012-09-10 21:04:01 +02:00
2012-08-15 22:32:06 +03:00
2012-08-12 05:32:07 +02:00
2012-09-03 01:26:57 +02:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-08-18 09:52:15 +02:00
2012-09-30 13:39:38 +00:00
2012-08-28 04:07:53 +02:00
2012-09-23 15:24:08 +02:00