February 2015 - ffmpeg-cvslog

avformat/flvenc: check that the codec_tag fits in the available bits
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Sat Feb 28 20:58:31 2015 +0100| [e8565d21c276ab9ac5ce785549420321fbd0b093] | committer: Michael Niedermayer avformat/flvenc: check that the codec_tag fits in the available bits flags is later written with avio_w8 and if it doesn't fit in one byte it triggers an av_assert2. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8565d21c276ab9ac… --- libavformat/flvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 7d3a0ca..e19374f 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -537,7 +537,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_w8(pb, FLV_TAG_TYPE_VIDEO); flags = enc->codec_tag; - if (flags == 0) { + if (flags <= 0 || flags > 15) { av_log(s, AV_LOG_ERROR, "Video codec '%s' is not compatible with FLV\n", avcodec_get_name(enc->codec_id));

1 0

avcodec/utils: use correct printf specifier in ff_set_sar
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Sat Feb 28 20:11:36 2015 +0100| [732c3ebffaff5005367d7f947fa903f3b6e92f68] | committer: Michael Niedermayer avcodec/utils: use correct printf specifier in ff_set_sar Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=732c3ebffaff50053… --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c5e6300..581cd04 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -246,7 +246,7 @@ int ff_set_sar(AVCodecContext *avctx, AVRational sar) int ret = av_image_check_sar(avctx->width, avctx->height, sar); if (ret < 0) { - av_log(avctx, AV_LOG_WARNING, "ignoring invalid SAR: %u/%u\n", + av_log(avctx, AV_LOG_WARNING, "ignoring invalid SAR: %d/%d\n", sar.num, sar.den); avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; return ret;

1 0

avutil/imgutils: correctly check for negative SAR components
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 21:57:11 2015 +0100| [5705dc527687fd84d94c934169b6bd753459744f] | committer: Michael Niedermayer avutil/imgutils: correctly check for negative SAR components These could trigger assert failures previously Found-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5705dc527687fd84d… --- libavutil/imgutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 07b494c..a8bc18d 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -245,7 +245,7 @@ int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar) { int64_t scaled_dim; - if (!sar.den) + if (sar.den <= 0 || sar.num < 0) return AVERROR(EINVAL); if (!sar.num || sar.num == sar.den)

1 0

Merge commit '07db7a0dd8239e255c08800162eb45b82c2c49fe' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:16:23 2015 +0100| [7ca10906b4ce4bdde6d681cc3fb2f5567f362d34] | committer: Michael Niedermayer Merge commit '07db7a0dd8239e255c08800162eb45b82c2c49fe' into release/2.4 * commit '07db7a0dd8239e255c08800162eb45b82c2c49fe': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bc341684c56ac1fe057397adbadf329ee Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ca10906b4ce4bdde… ---

1 0

Merge commit 'e10028431d5cd90db7b2a4b0d16721bb1a6d75e3' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:19:52 2015 +0100| [d04bfdf0f792d3060fd919fae9ef3cd8e38ea9d7] | committer: Michael Niedermayer Merge commit 'e10028431d5cd90db7b2a4b0d16721bb1a6d75e3' into release/2.4 * commit 'e10028431d5cd90db7b2a4b0d16721bb1a6d75e3': icecast: Do not use chunked post Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d04bfdf0f792d3060… ---

1 0

Merge commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:19:03 2015 +0100| [05c4b502165e1789f4f17a2bad27255c2f5d4201] | committer: Michael Niedermayer Merge commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c' into release/2.4 * commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c': img2dec: correctly use the parsed value from -start_number Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05c4b502165e1789f… ---

1 0

icecast: Do not use chunked post
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Mark McGough <madmanmarkau(a)gmail.com> | Sun Oct 12 18:24:07 2014 +0800| [e10028431d5cd90db7b2a4b0d16721bb1a6d75e3] | committer: Luca Barbato icecast: Do not use chunked post Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by default chunked post. Icecast actually forwards the HTTP chunk headers to the listener as part of the media stream (without the chunk encoding HTTP headers) causing the players to lose sync. Disabling the option is enough to feed icecast properly. (cherry picked from commit 76c70e33d2244a688832f03b53862eb5d9ad3b01) Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e10028431d5cd90db… --- libavformat/icecast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/icecast.c b/libavformat/icecast.c index b671d8c..155396f 100644 --- a/libavformat/icecast.c +++ b/libavformat/icecast.c @@ -126,6 +126,7 @@ static int icecast_open(URLContext *h, const char *uri, int flags) av_dict_set(&opt_dict, "method", s->legacy_icecast ? "SOURCE" : "PUT", 0); av_dict_set(&opt_dict, "auth_type", "basic", 0); av_dict_set(&opt_dict, "headers", headers, 0); + av_dict_set(&opt_dict, "chunked_post", "0", 0); if (NOT_EMPTY(s->content_type)) av_dict_set(&opt_dict, "content_type", s->content_type, 0); if (NOT_EMPTY(s->user_agent))

1 0

img2dec: correctly use the parsed value from -start_number
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Tue Jan 6 16:47:18 2015 +0100| [4cd54b2f976738682cdf8a38a1719b8bba1a018c] | committer: Vittorio Giovara img2dec: correctly use the parsed value from -start_number Previously the image sequence was always starting from the minimum number rather than the requested one. CC: libav-stable(a)libav.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cd54b2f976738682… --- libavformat/img2dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index f7f0a11..b73554e 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -194,7 +194,7 @@ static int img_read_header(AVFormatContext *s1) return AVERROR(ENOENT); s->img_first = first_index; s->img_last = last_index; - s->img_number = first_index; + s->img_number = s->start_number != 1 ? s->start_number : first_index; /* compute duration */ st->start_time = 0; st->duration = last_index - first_index + 1;

1 0

h264_cabac: Break infinite loops
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 31 04:20:24 2013 +0100| [07db7a0dd8239e255c08800162eb45b82c2c49fe] | committer: Vittorio Giovara h264_cabac: Break infinite loops This fixes out of array reads and/or infinite loops. 30 is the maximum number of bits that can be read into coeff_abs below. CC: libav-stable(a)libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07db7a0dd8239e255… --- libavcodec/h264_cabac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index f1ab97a..cce6450 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1711,7 +1711,7 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, \ if( coeff_abs >= 15 ) { \ int j = 0; \ - while( get_cabac_bypass( CC ) ) { \ + while (get_cabac_bypass(CC) && j < 30) { \ j++; \ } \ \

1 0

Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:05:48 2015 +0100| [76848048c7a97eb70f45531ba7443d4de1c5125b] | committer: Michael Niedermayer Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4 * commit '2d1309c3528f89bfafe1298badf39fe7a1be0542': hevc_deblock: Fix compilation with nasm See: c75fdee747179e21e3cc137b2565ba911b17f9c5 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76848048c7a97eb70… ---

1 0