cosmetics: Fix indentation after last commit.
Originally committed as revision 10638 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
465c9fdeeb
commit
6006a68989
@ -35,8 +35,8 @@ extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
|
|||||||
|
|
||||||
void MPV_common_init_ppc(MpegEncContext *s)
|
void MPV_common_init_ppc(MpegEncContext *s)
|
||||||
{
|
{
|
||||||
if (s->avctx->lowres==0)
|
if (s->avctx->lowres==0)
|
||||||
{
|
{
|
||||||
if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
|
if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
|
||||||
(s->avctx->idct_algo == FF_IDCT_ALTIVEC))
|
(s->avctx->idct_algo == FF_IDCT_ALTIVEC))
|
||||||
{
|
{
|
||||||
@ -44,33 +44,33 @@ void MPV_common_init_ppc(MpegEncContext *s)
|
|||||||
s->dsp.idct_add = idct_add_altivec;
|
s->dsp.idct_add = idct_add_altivec;
|
||||||
s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
|
s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test to make sure that the dct required alignments are met.
|
// Test to make sure that the dct required alignments are met.
|
||||||
if ((((long)(s->q_intra_matrix) & 0x0f) != 0) ||
|
if ((((long)(s->q_intra_matrix) & 0x0f) != 0) ||
|
||||||
(((long)(s->q_inter_matrix) & 0x0f) != 0))
|
(((long)(s->q_inter_matrix) & 0x0f) != 0))
|
||||||
{
|
{
|
||||||
av_log(s->avctx, AV_LOG_INFO, "Internal Error: q-matrix blocks must be 16-byte aligned "
|
av_log(s->avctx, AV_LOG_INFO, "Internal Error: q-matrix blocks must be 16-byte aligned "
|
||||||
"to use Altivec DCT. Reverting to non-altivec version.\n");
|
"to use Altivec DCT. Reverting to non-altivec version.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((long)(s->intra_scantable.inverse) & 0x0f) != 0)
|
if (((long)(s->intra_scantable.inverse) & 0x0f) != 0)
|
||||||
{
|
{
|
||||||
av_log(s->avctx, AV_LOG_INFO, "Internal Error: scan table blocks must be 16-byte aligned "
|
av_log(s->avctx, AV_LOG_INFO, "Internal Error: scan table blocks must be 16-byte aligned "
|
||||||
"to use Altivec DCT. Reverting to non-altivec version.\n");
|
"to use Altivec DCT. Reverting to non-altivec version.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
|
if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
|
||||||
(s->avctx->dct_algo == FF_DCT_ALTIVEC))
|
(s->avctx->dct_algo == FF_DCT_ALTIVEC))
|
||||||
{
|
{
|
||||||
#if 0 /* seems to cause trouble under some circumstances */
|
#if 0 /* seems to cause trouble under some circumstances */
|
||||||
s->dct_quantize = dct_quantize_altivec;
|
s->dct_quantize = dct_quantize_altivec;
|
||||||
#endif
|
#endif
|
||||||
s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
|
s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
|
||||||
s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
|
s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user