diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
| commit | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (patch) | |
| tree | a5f3a6d636e96f05bb52f0b2407107a7f0c8b443 /libmpcodecs | |
| parent | 03aa64687fc109c5f2346a3c191b70698b333509 (diff) | |
| parent | 0e77da241da8b911c96a0e22898e84d7f7b74678 (diff) | |
| download | mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.bz2 mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.xz | |
Merge svn changes up to r28403
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ae_lame.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_filmdint.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_tfields.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c index c539d6ba6d..14cdcc6ac1 100644 --- a/libmpcodecs/ae_lame.c +++ b/libmpcodecs/ae_lame.c @@ -136,6 +136,7 @@ static void fixup(audio_encoder_t *encoder) // fixup CBR mp3 audio header: if(!lame_param_vbr) { encoder->stream->h.dwSampleSize=1; + if (encoder->stream->h.dwLength) ((MPEGLAYER3WAVEFORMAT*)(encoder->stream->wf))->nBlockSize= (encoder->stream->size+(encoder->stream->h.dwLength>>1))/encoder->stream->h.dwLength; encoder->stream->h.dwLength=encoder->stream->size; diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 653ae37750..8ab4cc43d3 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -246,8 +246,8 @@ m_option_t lavcopts_conf[]={ {"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, {"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, {"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL}, -#ifdef CODEC_FLAG_H263P_AIC - {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC, NULL}, +#ifdef CODEC_FLAG_AC_PRED + {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL}, {"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV, NULL}, #endif #ifdef CODEC_FLAG_H263P_AIV diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 45e0907cc5..5427171fbd 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -431,7 +431,7 @@ block_metrics_3dnow(unsigned char *a, unsigned char *b, int as, int bs, int lines, struct vf_priv_s *p, struct frame_stats *s) { struct metrics tm; -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_3dnow: internal error\n"); #else static const unsigned long long ones = 0x0101010101010101ull; @@ -1424,7 +1424,7 @@ static int open(vf_instance_t *vf, char* args) #if !HAVE_MMX p->mmx2 = 0; #endif -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW p->mmx2 &= 1; #endif p->thres.odd = p->thres.even; diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c index 0ebf41ddb2..3203054d85 100644 --- a/libmpcodecs/vf_tfields.c +++ b/libmpcodecs/vf_tfields.c @@ -47,7 +47,7 @@ static void deint(unsigned char *dest, int ds, unsigned char *src, int ss, int w } } -#if HAVE_3DNOW +#if HAVE_AMD3DNOW static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up) { int i, j, ssd=ss; @@ -487,7 +487,7 @@ static int open(vf_instance_t *vf, char* args) #if HAVE_MMX2 if(gCpuCaps.hasMMX2) qpel_li = qpel_li_MMX2; #endif -#if HAVE_3DNOW +#if HAVE_AMD3DNOW if(gCpuCaps.has3DNow) qpel_li = qpel_li_3DNOW; #endif return 1; |