June 2015 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 13:08:26 2015 +0200| [088b410ea2eebcfdf57f7e0c419fe6be8d440eb6] | committer: Michael Niedermayer Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258' * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=088b410ea2eebcfdf… ---

1 0

mpegts: Add jpeg2000 stream type
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | John Högberg <john.hogberg(a)ericsson.com> | Mon Jun 29 14:57:20 2015 +0200| [42bc768e5240ec01237ad2eb7c69b917158de258] | committer: Luca Barbato mpegts: Add jpeg2000 stream type Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42bc768e5240ec012… --- libavformat/mpegts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 8f61f17..f96d9f0 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -583,6 +583,7 @@ static const StreamType ISO_types[] = { { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */ { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, + { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },

1 0

Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 12:59:16 2015 +0200| [6d9dfb1267d0a5b23ed3e857526bbca74223313a] | committer: Michael Niedermayer Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501' * commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501': riff: Validate the wav header size before trying to parse it Conflicts: libavformat/riffdec.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d9dfb1267d0a5b23… ---

1 0

riff: Validate the wav header size before trying to parse it
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sun Jun 28 17:32:40 2015 +0200| [1b4c468477f3b8d372da8ef4e5405539ad9c1501] | committer: Luca Barbato riff: Validate the wav header size before trying to parse it > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b4c468477f3b8d37… --- libavformat/riffdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 74f93ac..2c43afc 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -79,6 +79,9 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) { int id; + if (size < 14) + return AVERROR_INVALIDDATA; + id = avio_rl16(pb); codec->codec_type = AVMEDIA_TYPE_AUDIO; codec->channels = avio_rl16(pb);

1 0

Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 12:24:12 2015 +0200| [3cd6b6aa0f847afeeac7742489f139ce39b4bdcb] | committer: Michael Niedermayer Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68' * commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68': asf: Do not skip data streams Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cd6b6aa0f847afee… ---

1 0

Rename asfdec-o.c to asfdec_o.c
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 11:57:35 2015 +0200| [0d5a27c2b5a1a2981f53aa5c093d1ddcc4ff472b] | committer: Michael Niedermayer Rename asfdec-o.c to asfdec_o.c Most files use _ instead of - as spacer, so this is more consistent Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d5a27c2b5a1a2981… --- libavformat/Makefile | 2 +- libavformat/{asfdec-o.c => asfdec_o.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index f348559..479361a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -84,7 +84,7 @@ OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o -OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec-o.o asf.o asfcrypt.o \ +OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec_o.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o subtitles.o diff --git a/libavformat/asfdec-o.c b/libavformat/asfdec_o.c similarity index 100% rename from libavformat/asfdec-o.c rename to libavformat/asfdec_o.c

1 0

avformat: rename asfdec.c to asfdec_f.c
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 11:45:14 2015 +0200| [8f9c39b3e8c99ffe8a75603138c37c711d9ae72f] | committer: Michael Niedermayer avformat: rename asfdec.c to asfdec_f.c leaving it as asfdec.c confuses git Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f9c39b3e8c99ffe8… --- libavformat/Makefile | 4 ++-- libavformat/{asfdec.c => asfdec_f.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 987f196..f348559 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -82,7 +82,7 @@ OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o -OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ +OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec-o.o asf.o asfcrypt.o \ avlanguage.o @@ -471,7 +471,7 @@ OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o -OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asfdec.o asf.o asfcrypt.o \ +OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asfdec_f.o asf.o asfcrypt.o \ avlanguage.o mpegts.o isom.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv_common.o \ mpegtsenc.o asf.o diff --git a/libavformat/asfdec.c b/libavformat/asfdec_f.c similarity index 100% rename from libavformat/asfdec.c rename to libavformat/asfdec_f.c

1 0

asf: Do not skip data streams
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sun Jun 28 17:03:02 2015 +0200| [5bdfc17189e4ea63c6b46b6d5256852fcb409d68] | committer: Luca Barbato asf: Do not skip data streams > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bdfc17189e4ea63c… --- libavformat/asfdec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 8f46098..c12d8c7 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -747,12 +747,6 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable * av_init_packet(&asf_st->pkt.avpkt); asf_st->pkt.data_size = 0; avio_skip(pb, 4); // skip reserved field - if (!ts_data_len) { - av_log(s, AV_LOG_WARNING, "Suspicious data found! ASF stream #%d will be ignored.\n", - asf_st->stream_index); - align_position(pb, asf->offset, size); - return 0; - } switch (type) { case AVMEDIA_TYPE_AUDIO:

1 0

configure: fix hevc_vdpau_hwaccel dependencies
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Jun 30 04:09:58 2015 -0300| [6415dcb0131845489cb4e0ad7bd723694f98e060] | committer: James Almer configure: fix hevc_vdpau_hwaccel dependencies Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6415dcb0131845489… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f582deb..6c1c290 100755 --- a/configure +++ b/configure @@ -2376,7 +2376,7 @@ hevc_d3d11va_hwaccel_select="hevc_decoder" hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" -hevc_vdpau_hwaccep_select="hevc_decoder" +hevc_vdpau_hwaccel_select="hevc_decoder" mpeg_vdpau_decoder_deps="vdpau" mpeg_vdpau_decoder_select="mpeg2video_decoder" mpeg_xvmc_hwaccel_deps="xvmc"

1 0

avcodec/h264_refs: discard mismatching references
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 03:23:30 2015 +0200| [4aa0de644a2de62f0bc3013a4533ab9283aa0a65] | committer: Michael Niedermayer avcodec/h264_refs: discard mismatching references Fixes inconsistency and out of array access Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4aa0de644a2de62f0… --- libavcodec/h264_refs.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 0d8fa8b..ac6f6bf 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -125,6 +125,7 @@ static int add_sorted(H264Picture **sorted, H264Picture **src, int len, int limi int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) { int i, len; + int j; if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { H264Picture *sorted[32]; @@ -188,6 +189,21 @@ int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) } } #endif + + for (j = 0; j<1+(sl->slice_type_nos == AV_PICTURE_TYPE_B); j++) { + for (i = 0; i < sl->ref_count[j]; i++) { + if (h->default_ref_list[j][i].parent) { + AVFrame *f = h->default_ref_list[j][i].parent->f; + if (h->cur_pic_ptr->f->width != f->width || + h->cur_pic_ptr->f->height != f->height || + h->cur_pic_ptr->f->format != f->format) { + av_log(h->avctx, AV_LOG_ERROR, "Discarding mismatching reference\n"); + memset(&h->default_ref_list[j][i], 0, sizeof(h->default_ref_list[j][i])); + } + } + } + } + return 0; }

1 0