diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-21 17:39:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-21 17:39:30 +0200 |
| commit | ebb541c6553af10203b2c2f5bcead6118a44f5be (patch) | |
| tree | 3d98d89722d6784891b5da91555f22f76cdc92cf /libmpcodecs | |
| parent | e46317a1db077a7f92ea5db7bb76e6cc899f1a64 (diff) | |
| parent | a9abd00be4bfb498e1ba4e0ebc02c828a1a3db07 (diff) | |
| download | mpv-ebb541c6553af10203b2c2f5bcead6118a44f5be.tar.bz2 mpv-ebb541c6553af10203b2c2f5bcead6118a44f5be.tar.xz | |
Merge svn changes up to r28690
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_hue.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 69574e399e..b26292f86f 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -879,7 +879,7 @@ static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){ #if CONFIG_XVMC || CONFIG_VDPAU static enum PixelFormat get_format(struct AVCodecContext *avctx, const enum PixelFormat *fmt){ - enum PixelFormat selected_format = fmt[0]; + enum PixelFormat selected_format; int imgfmt; sh_video_t *sh = avctx->opaque; int i; @@ -889,10 +889,10 @@ static enum PixelFormat get_format(struct AVCodecContext *avctx, if(!IMGFMT_IS_XVMC(imgfmt) && !IMGFMT_IS_VDPAU(imgfmt)) continue; mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i); if(init_vo(sh, fmt[i]) >= 0) { - selected_format = fmt[i]; break; } } + selected_format = fmt[i]; imgfmt = pixfmt2imgfmt(selected_format); if(IMGFMT_IS_XVMC(imgfmt) || IMGFMT_IS_VDPAU(imgfmt)) { vd_ffmpeg_ctx *ctx = sh->context; diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c index b10626ddbc..32d2c46680 100644 --- a/libmpcodecs/vf_hue.c +++ b/libmpcodecs/vf_hue.c @@ -160,10 +160,6 @@ static int open(vf_instance_t *vf, char* args) vf->priv->hue *= M_PI / 180.0; process = process_C; -#if HAVE_MMXX - if(gCpuCaps.hasMMX) process = process_MMX; -#endif - return 1; } |