diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 14:04:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 14:15:40 +0100 |
| commit | 40c27504a5fdab915118b9742f93944ee5a6862c (patch) | |
| tree | 50425ac63d9a3a94edc39ea3c9bb07276928fd85 | |
| parent | dd5689a3bdaafea34ebc73bd3fe9173a7f6c8317 (diff) | |
| parent | 57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c (diff) | |
| download | ffmpeg-40c27504a5fdab915118b9742f93944ee5a6862c.tar.gz | |
Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'
* commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c':
wmv2: Propagate the wmv2 idct permutation type to the dsputils context
rtp: Make sure priv_data is set before reading it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/wmv2.c | 1 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 9c94498bf1..6676652350 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -29,6 +29,7 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){ MpegEncContext * const s= &w->s; ff_wmv2dsp_init(&w->wdsp); + s->dsp.idct_permutation_type = w->wdsp.idct_perm; ff_init_scantable_permutation(s->dsp.idct_permutation, w->wdsp.idct_perm); ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], diff --git a/libavformat/rtp.c b/libavformat/rtp.c index c0090ada5e..e81d2c2ad8 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -104,7 +104,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, for (i = 0; rtp_payload_types[i].pt >= 0; ++i) if (rtp_payload_types[i].codec_id == codec->codec_id) { if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || - !fmt->oformat->priv_class || + !fmt->oformat->priv_class || !fmt->priv_data || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) continue; /* G722 has 8000 as nominal rate even if the sample rate is 16000, |