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 | |
| 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>
| -rw-r--r-- | libavcodec/h263dec.c | 8 | ||||
| -rw-r--r-- | libavcodec/vc1.c | 42 | ||||
| -rw-r--r-- | libavformat/nut.h | 3 | ||||
| -rw-r--r-- | libavutil/rational.c | 1 |
4 files changed, 21 insertions, 33 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); } diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 818e8d3c0d..e4b62fe3de 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -578,27 +578,27 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex } /* fill lookup tables for intensity compensation */ -#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do {\ - int scale, shift, i; \ - if (!lumscale) { \ - scale = -64; \ - shift = (255 - lumshift * 2) << 6; \ - if (lumshift > 31) \ - shift += 128 << 6; \ - } else { \ - scale = lumscale + 32; \ - if (lumshift > 31) \ - shift = (lumshift - 64) << 6; \ - else \ - shift = lumshift << 6; \ - } \ - for (i = 0; i < 256; i++) { \ - int iy = chain ? luty[i] : i; \ - int iu = chain ? lutuv[i] : i; \ - luty[i] = av_clip_uint8((scale * iy + shift + 32) >> 6); \ - lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6); \ - } \ - }while(0) +#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do { \ + int scale, shift, i; \ + if (!lumscale) { \ + scale = -64; \ + shift = (255 - lumshift * 2) << 6; \ + if (lumshift > 31) \ + shift += 128 << 6; \ + } else { \ + scale = lumscale + 32; \ + if (lumshift > 31) \ + shift = (lumshift - 64) << 6; \ + else \ + shift = lumshift << 6; \ + } \ + for (i = 0; i < 256; i++) { \ + int iy = chain ? luty[i] : i; \ + int iu = chain ? lutuv[i] : i; \ + luty[i] = av_clip_uint8((scale * iy + shift + 32) >> 6); \ + lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6);\ + } \ + } while(0) static void rotate_luts(VC1Context *v) diff --git a/libavformat/nut.h b/libavformat/nut.h index c60eb35929..dc5af15a57 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -22,9 +22,6 @@ #ifndef AVFORMAT_NUT_H #define AVFORMAT_NUT_H -//#include <limits.h> -//#include "libavutil/adler32.h" -//#include "libavcodec/mpegaudio.h" #include "avformat.h" #include "internal.h" #include "metadata.h" diff --git a/libavutil/rational.c b/libavutil/rational.c index 768f2524c7..e333f620f9 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -26,7 +26,6 @@ */ #include "avassert.h" -//#include <math.h> #include <limits.h> #include "common.h" |