FFmpeg/libavcodec
Michael Niedermayer 8f7b022c8c Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 04:10:10 +02:00
..
2015-03-10 23:33:57 +01:00
2015-04-18 14:13:59 -03:00
2015-04-18 14:15:07 -03:00
2015-02-21 20:38:13 +01:00
2015-02-06 19:07:29 +01:00
2015-02-05 09:48:54 +00:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-02-08 00:12:46 +01:00
2015-02-14 19:45:23 +00:00
2015-03-14 14:05:25 +01:00
2015-02-10 14:20:32 +00:00
2015-03-02 19:32:23 +01:00
2015-04-10 12:38:03 +02:00
2015-04-10 03:11:40 +02:00
2015-04-15 09:48:47 +02:00
2015-02-24 03:15:42 +01:00
2015-03-16 13:04:47 +01:00
2015-02-06 21:02:08 +01:00
2015-04-02 16:04:22 +02:00
2015-02-14 12:48:41 +00:00
2015-04-18 18:07:54 -03:00
2015-02-04 09:45:41 +00:00