Michael Niedermayer
|
8f7b022c8c
|
Merge commit '6a85dfc830'
* commit '6a85dfc830':
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 |
|
Vittorio Giovara
|
6a85dfc830
|
lavc: Replace av_dlog and tprintf with internal macros
|
2015-04-19 12:41:59 +01:00 |
|
Michael Niedermayer
|
98263d7515
|
Merge commit '23944d29a2'
* commit '23944d29a2':
indeo: Give Indeo4/5 shared code a more consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-03-30 20:39:08 +02:00 |
|
Diego Biurrun
|
23944d29a2
|
indeo: Give Indeo4/5 shared code a more consistent name
|
2015-03-30 17:49:05 +02:00 |
|