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

Unified Diff: source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.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/x86/motion_est_mmx.c
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c (working copy)
@@ -427,7 +427,9 @@
void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx)
{
- if (mm_flags & FF_MM_MMX) {
+ int mm_flags = av_get_cpu_flags();
+
+ if (mm_flags & AV_CPU_FLAG_MMX) {
c->pix_abs[0][0] = sad16_mmx;
c->pix_abs[0][1] = sad16_x2_mmx;
c->pix_abs[0][2] = sad16_y2_mmx;
@@ -440,7 +442,7 @@
c->sad[0]= sad16_mmx;
c->sad[1]= sad8_mmx;
}
- if (mm_flags & FF_MM_MMX2) {
+ if (mm_flags & AV_CPU_FLAG_MMX2) {
c->pix_abs[0][0] = sad16_mmx2;
c->pix_abs[1][0] = sad8_mmx2;
@@ -456,7 +458,7 @@
c->pix_abs[1][3] = sad8_xy2_mmx2;
}
}
- if ((mm_flags & FF_MM_SSE2) && !(mm_flags & FF_MM_3DNOW) && avctx->codec_id != CODEC_ID_SNOW) {
+ if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW) && avctx->codec_id != CODEC_ID_SNOW) {
c->sad[0]= sad16_sse2;
}
}
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/x86/idct_sse2_xvid.c ('k') | source/patched-ffmpeg-mt/libavcodec/x86/mpegaudiodec_mmx.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698