Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: source/patched-ffmpeg-mt/libavcodec/arm/dsputil_iwmmxt.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/patched-ffmpeg-mt/libavcodec/arm/dsputil_iwmmxt.c
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/arm/dsputil_iwmmxt.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavcodec/arm/dsputil_iwmmxt.c (working copy)
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/cpu.h"
#include "libavcodec/dsputil.h"
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
@@ -150,18 +151,19 @@
/* A run time test is not simple. If this file is compiled in
* then we should install the functions
*/
-int mm_flags = FF_MM_IWMMXT; /* multimedia extension flags */
void ff_dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx)
{
+ int mm_flags = AV_CPU_FLAG_IWMMXT; /* multimedia extension flags */
+
if (avctx->dsp_mask) {
- if (avctx->dsp_mask & FF_MM_FORCE)
+ if (avctx->dsp_mask & AV_CPU_FLAG_FORCE)
mm_flags |= (avctx->dsp_mask & 0xffff);
else
mm_flags &= ~(avctx->dsp_mask & 0xffff);
}
- if (!(mm_flags & FF_MM_IWMMXT)) return;
+ if (!(mm_flags & AV_CPU_FLAG_IWMMXT)) return;
c->add_pixels_clamped = add_pixels_clamped_iwmmxt;
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.c ('k') | source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_iwmmxt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698