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>
This commit is contained in:
Michael Niedermayer 2013-04-12 22:44:08 +02:00
commit ed3680bc9b

View File

@ -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) {