diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:11:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:11:04 +0200 |
| commit | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (patch) | |
| tree | 3010a3ff42df02f266340063659af000174dff0b /libavcodec/h263dec.c | |
| parent | d686517ad113e72b9e434b35598a4a8480d79307 (diff) | |
| parent | d46c588f3cb1963a00e990ceaf4ba9ffa05a716d (diff) | |
| download | ffmpeg-4390fa6273e603f17a2c7244a5de0d8e36397f59.tar.gz | |
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
Remove commented-out #includes
h263dec: Remove broken and disabled debug cruft
vc1: Reindent INIT_LUT(), align backslashes
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 405d3c68fd..7d28872955 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -42,7 +42,6 @@ #include "mpeg4video.h" //#define DEBUG -//#define PRINT_FRAME_TIME av_cold int ff_h263_decode_init(AVCodecContext *avctx) { @@ -355,9 +354,6 @@ int ff_h263_decode_frame(AVCodecContext *avctx, int ret; AVFrame *pict = data; -#ifdef PRINT_FRAME_TIME -uint64_t time= rdtsc(); -#endif s->flags= avctx->flags; s->flags2= avctx->flags2; @@ -766,10 +762,6 @@ intrax8_decoded: *got_frame = 1; } -#ifdef PRINT_FRAME_TIME -av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time); -#endif - return (ret && (avctx->err_recognition & AV_EF_EXPLODE))?ret:get_consumed_bytes(s, buf_size); } |