virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

revert bad checkin

Browse Source 
Originally committed as revision 7044 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2006-11-14 03:18:09 +00:00
parent be6ed6fff4
commit 486497e07b
18 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/armv4l/dsputil_iwmmxt.c
+5 -5
View File
@@ -128,7 +128,7 @@ static void nop(uint8_t *block, const uint8_t *pixels, int line_size, int h)
return;
}
int ff_mm_flags; /* multimedia extension flags */
int mm_flags; /* multimedia extension flags */
int mm_support(void)
{
@@ -137,16 +137,16 @@ int mm_support(void)
void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx)
{
ff_mm_flags = mm_support();
mm_flags = mm_support();
if (avctx->dsp_mask) {
if (avctx->dsp_mask & FF_MM_FORCE)
ff_mm_flags |= (avctx->dsp_mask & 0xffff);
mm_flags |= (avctx->dsp_mask & 0xffff);
else
ff_mm_flags &= ~(avctx->dsp_mask & 0xffff);
mm_flags &= ~(avctx->dsp_mask & 0xffff);
}
if (!(ff_mm_flags & MM_IWMMXT)) return;
if (!(mm_flags & MM_IWMMXT)) return;
c->add_pixels_clamped = add_pixels_clamped_iwmmxt;
libavcodec/armv4l/mpegvideo_iwmmxt.c
+1 -1
View File
@@ -110,7 +110,7 @@ static void dct_unquantize_h263_inter_iwmmxt(MpegEncContext *s,
void MPV_common_init_iwmmxt(MpegEncContext *s)
{
if (!(ff_mm_flags & MM_IWMMXT)) return;
if (!(mm_flags & MM_IWMMXT)) return;
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_iwmmxt;
#if 0