diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 15:51:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 16:12:38 +0200 |
| commit | 31ab1575e59e33957864d1bdf13253f8d366ccba (patch) | |
| tree | 074dd6605a3d7e0a42b6cd12d2f071fe25d3d25a /libavcodec/vc1.c | |
| parent | adc5539e7b94a94114d591d83e7ae63f52b5916f (diff) | |
| parent | 1218777ffd152287244349d4ff9e1cbc84fa2c54 (diff) | |
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>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index d7352d3671..56c5bf9932 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -395,8 +395,6 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo v->res_rtm_flag = get_bits1(gb); //reserved } if (!v->res_rtm_flag) { -// av_log(avctx, AV_LOG_ERROR, -// "0 for reserved RES_RTM_FLAG is forbidden\n"); av_log(avctx, AV_LOG_ERROR, "Old WMV3 version detected, some frames may be decoded incorrectly\n"); //return -1; @@ -663,8 +661,9 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) v->x8_type = get_bits1(gb); } else v->x8_type = 0; -//av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", -// (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm); + av_dlog(v->s.avctx, "%c Frame: QP=[%i]%i (+%i/2) %i\n", + (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'), + pqindex, v->pq, v->halfpq, v->rangeredfrm); if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P) v->use_ic = 0; |