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-09-13 15:35:50 +02:00
2012-08-31 15:39:03 +02:00
2012-09-18 00:45:29 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-09-11 22:59:43 +02:00
2012-09-26 01:56:01 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-09-14 14:13:38 +02:00
2012-09-13 21:38:47 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-09-28 12:25:07 -04:00
2012-08-13 14:38:43 +02:00
2012-08-09 19:31:56 +02:00
2012-08-29 18:04:34 +02:00
2012-09-09 13:27:42 +02:00
2012-08-31 13:34:32 +02:00
2012-08-03 23:13:06 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 01:53:25 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 15:39:03 +02:00
2012-08-31 15:39:03 +02:00
2012-08-14 15:34:39 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 13:34:32 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00
2012-08-07 15:20:56 +01:00
2012-08-31 13:34:32 +02:00
2012-08-07 15:20:56 +01:00
2012-08-07 23:04:55 +02:00
2012-09-09 17:21:02 +02:00
2012-09-14 14:13:38 +02:00
2012-08-09 19:31:56 +02:00
2012-08-16 17:26:06 +02:00
2012-09-14 14:13:38 +02:00
2012-08-31 15:39:03 +02:00
2012-09-08 12:53:44 +02:00
2012-09-10 14:06:20 +02:00
2012-08-09 19:31:56 +02:00
2012-09-09 13:27:42 +02:00
2012-08-29 18:04:34 +02:00
2012-09-18 16:15:17 +02:00
2012-10-01 16:12:38 +02:00
2012-08-29 18:13:00 +02:00
2012-09-25 18:10:11 +02:00
2012-09-09 13:27:42 +02:00
2012-08-08 15:45:09 +02:00
2012-09-09 13:27:42 +02:00
2012-08-31 15:39:03 +02:00
2012-09-08 18:18:34 +02:00
2012-08-07 15:21:20 +01:00
2012-09-09 13:27:42 +02:00
2012-08-07 15:21:20 +01:00
2012-09-08 18:18:34 +02:00
2012-08-29 18:04:34 +02:00
2012-08-29 18:04:34 +02:00
2012-09-01 10:59:16 +02:00
2012-09-15 16:26:00 +02:00
2012-08-31 13:01:30 +02:00
2012-08-13 14:38:43 +02:00
2012-09-09 13:27:42 +02:00
2012-07-29 02:16:26 +02:00
2012-08-31 13:01:30 +02:00
2012-08-07 23:04:55 +02:00
2012-09-06 16:23:17 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00