diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 22:44:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 23:28:23 +0200 |
| commit | ed3680bc9b8f7458ed62d252e2da0e141faa0377 (patch) | |
| tree | 49c876be3835f77c0b9b23f70194f16724098e76 /libavcodec | |
| parent | 0bc34ef02e072363c4abb83145d665b2ee4dc801 (diff) | |
| parent | 2004c7c8f763280ff3ba675ea21cf25396528fd3 (diff) | |
| download | ffmpeg-ed3680bc9b8f7458ed62d252e2da0e141faa0377.tar.gz | |
Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'
* commit '2004c7c8f763280ff3ba675ea21cf25396528fd3':
x86: dsputil: cosmetics: Remove two pointless variable indirections
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 52f7fdf616..68042bc08b 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1506,8 +1506,7 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx, int mm_flags) { - const int bit_depth = avctx->bits_per_raw_sample; - const int high_bit_depth = bit_depth > 8; + const int high_bit_depth = avctx->bits_per_raw_sample > 8; #if HAVE_SSE2_INLINE if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) { |