diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:28:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:28:36 +0100 |
| commit | 8a4464514fac40988f4d10e6419a8e1632dfba0c (patch) | |
| tree | 1ab932999f4b3ed6c77b14f663705828be238b57 | |
| parent | 85e94a30eeb97ac73959fa0e330c5c68e31942e6 (diff) | |
| parent | 3d67f52f9dcc60cd3a660ea363762575f3779df7 (diff) | |
| download | ffmpeg-8a4464514fac40988f4d10e6419a8e1632dfba0c.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Prepare for 9.2 Release
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
rtpenc_chain: Use the original AVFormatContext for getting payload type
rtp: Make sure the output format pointer is set
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 16 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpenc_chain.c | 2 | ||||
| -rw-r--r-- | libavresample/audio_mix.c | 9 |
4 files changed, 11 insertions, 18 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index fd254ccc30..4047aabc13 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -124,14 +124,14 @@ function ff_vp8_luma_dc_wht_armv6, export=1 sbfx r1, r9, #3, #13 sbfx r10, r4, #3, #13 #else - sxth r8, r8 - sxth r7, r7 - sxth r9, r9 - sxth r4, r4 - asr r8, #3 @ block[0][0] - asr r7, #3 @ block[0][1] - asr r9, #3 @ block[0][2] - asr r4, #3 @ block[0][3] + sxth r6, r8 + sxth r12, r7 + sxth r1, r9 + sxth r10, r4 + asr r6, #3 @ block[0][0] + asr r12, #3 @ block[0][1] + asr r1, #3 @ block[0][2] + asr r10, #3 @ block[0][3] #endif strh r6, [r0], #32 diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 952296e379..80e0c7d745 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -107,7 +107,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, /* static payload type */ for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i) if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) { - if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || + if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || !fmt->oformat || !fmt->oformat->priv_class || !fmt->priv_data || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) continue; diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index df7410d0c8..70d68ce534 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -64,7 +64,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, /* Get the payload type from the codec */ if (st->id < RTP_PT_PRIVATE) rtpctx->streams[0]->id = - ff_rtp_get_payload_type(rtpctx, st->codec, idx); + ff_rtp_get_payload_type(s, st->codec, idx); else rtpctx->streams[0]->id = st->id; diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 2b3d9f1f7a..c0560288a5 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -401,10 +401,6 @@ AudioMix *ff_audio_mix_alloc(AVAudioResampleContext *avr) av_free(matrix_dbl); } - ret = mix_function_init(am); - if (ret < 0) - goto error; - return am; error: @@ -544,8 +540,5 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride) return AVERROR(EINVAL); } - /* TODO: detect situations where we can just swap around pointers - instead of doing matrix multiplications with 0.0 and 1.0 */ - - return 0; + return mix_function_init(am); } |