December 2016 - ffmpeg-cvslog

doc/examples/transcode_aac: fix a typo
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Александр Слободенюк <alexander.slobodeniuk(a)bramtech.ru> | Wed Nov 30 13:31:58 2016 +0300| [3aa1ff30f3f44a2ee980556a9bd6c0bc7d9087ac] | committer: Michael Niedermayer doc/examples/transcode_aac: fix a typo Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3aa1ff30f3f44a2ee… --- doc/examples/transcode_aac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 9b3ee67..d7947b4 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -566,7 +566,7 @@ static int init_output_frame(AVFrame **frame, * sure that the audio frame can hold as many samples as specified. */ if ((error = av_frame_get_buffer(*frame, 0)) < 0) { - fprintf(stderr, "Could allocate output frame samples (error '%s')\n", + fprintf(stderr, "Could not allocate output frame samples (error '%s')\n", get_error_text(error)); av_frame_free(frame); return error;

1 0

ffmpeg: assert return value is initialized
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Thu Nov 24 15:45:00 2016 +0100| [4d57ca51d7afb05bfa8c9a889822253dfc239a0d] | committer: Michael Niedermayer ffmpeg: assert return value is initialized Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d57ca51d7afb05bf… --- ffmpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ffmpeg.c b/ffmpeg.c index c47a824..e4890a4 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2070,6 +2070,7 @@ static int send_frame_to_filters(InputStream *ist, AVFrame *decoded_frame) int i, ret; AVFrame *f; + av_assert1(ist->nb_filters > 0); /* ensure ret is initialized */ for (i = 0; i < ist->nb_filters; i++) { if (i < ist->nb_filters - 1) { f = ist->filter_frame;

1 0

lavfi: Fix aix compilation.
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Nov 29 21:49:22 2016 +0100| [d44af9a38e6b116e1a89b2862f4d4f8cb9855387] | committer: Carl Eugen Hoyos lavfi: Fix aix compilation. Rename hz in af_apulsator.c and avf_showspectrum.c as hertz. The aix header sys/m_param.h defines hz as __hz. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d44af9a38e6b116e1… --- libavfilter/af_apulsator.c | 6 +++--- libavfilter/avf_showspectrum.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index 802b8d0..67711a2 100644 --- a/libavfilter/af_apulsator.c +++ b/libavfilter/af_apulsator.c @@ -47,7 +47,7 @@ typedef struct AudioPulsatorContext { double offset_r; double pwidth; double bpm; - double hz; + double hertz; int ms; int timing; @@ -76,7 +76,7 @@ static const AVOption apulsator_options[] = { { "hz", NULL, 0, AV_OPT_TYPE_CONST, {.i64=UNIT_HZ}, 0, 0, FLAGS, "timing" }, { "bpm", "set BPM", OFFSET(bpm), AV_OPT_TYPE_DOUBLE, {.dbl=120}, 30, 300, FLAGS }, { "ms", "set ms", OFFSET(ms), AV_OPT_TYPE_INT, {.i64=500}, 10, 2000, FLAGS }, - { "hz", "set frequency", OFFSET(hz), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 0.01, 100, FLAGS }, + { "hz", "set frequency", OFFSET(hertz), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 0.01, 100, FLAGS }, { NULL } }; @@ -208,7 +208,7 @@ static int config_input(AVFilterLink *inlink) switch (s->timing) { case UNIT_BPM: freq = s->bpm / 60; break; case UNIT_MS: freq = 1 / (s->ms / 1000.); break; - case UNIT_HZ: freq = s->hz; break; + case UNIT_HZ: freq = s->hertz; break; default: av_assert0(0); } diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index f63fbe8..8a08b20 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -1120,13 +1120,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink) dst[x] = 200; } for (y = 0; y < h; y += 40) { - float hz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h))); + float hertz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h))); char *units; - if (hz == 0) + if (hertz == 0) units = av_asprintf("DC"); else - units = av_asprintf("%.2f", hz); + units = av_asprintf("%.2f", hertz); if (!units) return AVERROR(ENOMEM); @@ -1185,13 +1185,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink) dst[x] = 200; } for (x = 0; x < w; x += 80) { - float hz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w))); + float hertz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w))); char *units; - if (hz == 0) + if (hertz == 0) units = av_asprintf("DC"); else - units = av_asprintf("%.2f", hz); + units = av_asprintf("%.2f", hertz); if (!units) return AVERROR(ENOMEM);

1 0

avcodec/vdpau_hevc: Fix potential out-of-bounds write
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Wed Nov 30 16:13:14 2016 -0800| [4e6d1c1f4ec83000a067ff14452b34c1f2d2a43a] | committer: Philip Langdale avcodec/vdpau_hevc: Fix potential out-of-bounds write The maximum number of references is 16, so the index value cannot exceed 15. Fixes Coverity CID 1348139, 1348140, 1348141 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e6d1c1f4ec83000a… --- libavcodec/vdpau_hevc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 03c61dc..ce2610f 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -234,7 +234,7 @@ static int vdpau_hevc_start_frame(AVCodecContext *avctx, const HEVCFrame *frame = &h->DPB[i]; if (frame != h->ref && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) { - if (j > 16) { + if (j > 15) { av_log(avctx, AV_LOG_WARNING, "VDPAU only supports up to 16 references in the DPB. " "This frame may not be decoded correctly.\n");

1 0

avcodec/crystalhd: Handle errors from av_image_get_linesize
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Wed Nov 30 16:03:44 2016 -0800| [5512dbe37f83d8b11393c7059c6eae48d164461c] | committer: Philip Langdale avcodec/crystalhd: Handle errors from av_image_get_linesize This function can return an error in certain situations. Fixes Coverity CID 703707. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5512dbe37f83d8b11… --- libavcodec/crystalhd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index d85e351..630d02b 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -568,6 +568,9 @@ static inline CopyRet copy_frame(AVCodecContext *avctx, } bwidth = av_image_get_linesize(avctx->pix_fmt, width, 0); + if (bwidth < 0) + return RET_ERROR; + if (priv->is_70012) { int pStride; @@ -577,6 +580,8 @@ static inline CopyRet copy_frame(AVCodecContext *avctx, pStride = 1280; else pStride = 1920; sStride = av_image_get_linesize(avctx->pix_fmt, pStride, 0); + if (sStride < 0) + return RET_ERROR; } else { sStride = bwidth; }

1 0

ffserver: fix broken HTML on generated status page
by git＠videolan.org 01 Dec '16

01 Dec '16

ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> | Wed Nov 30 10:28:16 2016 -0800| [b5c899ab5ec8ff89daf4d034f257dd0892625400] | committer: Reynaldo H. Verdejo Pinochet ffserver: fix broken HTML on generated status page Dropped incompatible/obsoleted HTML tag attributes Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5c899ab5ec8ff89d… --- ffserver.c | 27 +++++++++++++-------------- tests/ffserver.regression.ref | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ffserver.c b/ffserver.c index d6b7b44..4e5ce1f 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1885,8 +1885,8 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream) stream_no = stream->nb_streams; - avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>" - "type<th>kbit/s<th align=left>codec<th align=left>" + avio_printf(pb, "<table><tr><th>Stream<th>" + "type<th>kbit/s<th>codec<th>" "Parameters\n"); for (i = 0; i < stream_no; i++) { @@ -1912,7 +1912,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream) abort(); } - avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%"PRId64 + avio_printf(pb, "<tr><td>%d<td>%s<td>%"PRId64 "<td>%s<td>%s\n", i, type, (int64_t)st->codecpar->bit_rate/1000, codec ? codec->name : "", parameters); @@ -1979,8 +1979,8 @@ static void compute_status(HTTPContext *c) avio_printf(pb, "<h1>%s Status</h1>\n", program_name); /* format status */ avio_printf(pb, "<h2>Available Streams</h2>\n"); - avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n"); - avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbit/s<th align=left>Video<br>kbit/s<th><br>Codec<th align=left>Audio<br>kbit/s<th><br>Codec<th align=left valign=top>Feed\n"); + avio_printf(pb, "<table>\n"); + avio_printf(pb, "<tr><th>Path<th>Served<br>Conns<th><br>bytes<th>Format<th>Bit rate<br>kbit/s<th>Video<br>kbit/s<th><br>Codec<th>Audio<br>kbit/s<th><br>Codec<th>Feed\n"); stream = config.first_stream; while (stream) { char sfilename[1024]; @@ -2014,7 +2014,7 @@ static void compute_status(HTTPContext *c) avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ", sfilename, stream->filename); - avio_printf(pb, "<td align=right> %d <td align=right> ", + avio_printf(pb, "<td> %d <td> ", stream->conns_served); // TODO: Investigate if we can make http bitexact so it always produces the same count of bytes if (!config.bitexact) @@ -2058,8 +2058,7 @@ static void compute_status(HTTPContext *c) } } - avio_printf(pb, "<td align=center> %s <td align=right> %d " - "<td align=right> %d <td> %s %s <td align=right> " + avio_printf(pb, "<td> %s <td> %d <td> %d <td> %s %s <td> " "%d <td> %s %s", stream->fmt->name, stream->bandwidth, video_bit_rate / 1000, video_codec_name, @@ -2074,8 +2073,8 @@ static void compute_status(HTTPContext *c) } break; default: - avio_printf(pb, "<td align=center> - <td align=right> - " - "<td align=right> - <td><td align=right> - <td>\n"); + avio_printf(pb, "<td> - <td> - " + "<td> - <td><td> - <td>\n"); break; } stream = stream->next; @@ -2158,16 +2157,16 @@ static void compute_status(HTTPContext *c) p = inet_ntoa(c1->from_addr.sin_addr); clean_html(c1->clean_url, sizeof(c1->clean_url), c1->url); avio_printf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s<td>%s" - "<td align=right>", + "<td>", i, c1->stream ? c1->stream->filename : "", c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", p, c1->clean_url, c1->protocol, http_state[c1->state]); fmt_bytecount(pb, bitrate); - avio_printf(pb, "<td align=right>"); + avio_printf(pb, "<td>"); fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8); - avio_printf(pb, "<td align=right>"); + avio_printf(pb, "<td>"); fmt_bytecount(pb, c1->data_count); avio_printf(pb, "\n"); c1 = c1->next; @@ -2178,7 +2177,7 @@ static void compute_status(HTTPContext *c) /* date */ ti = time(NULL); p = ctime(&ti); - avio_printf(pb, "<hr size=1 noshade>Generated at %s", p); + avio_printf(pb, "<hr>Generated at %s", p); } avio_printf(pb, "</body>\n</html>\n"); diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref index 3fdb6d6..3106f85 100644 --- a/tests/ffserver.regression.ref +++ b/tests/ffserver.regression.ref @@ -8,4 +8,4 @@ dc16f607e13328a832e73801cd21ec98 *ff-test_h.asf 4c887dfc1dd0f6ea1a3a2be6dd32e495 *ff-test.jpg 1d04b73b04aad27793cc762d5afabac1 *ff-test_small.jpg bc36c40ee34ebee6ffe50f3094aab733 *ff-test.mjpg -128530a16464be60d27d013c30401851 *ff-stat +fd038af80560e15271ce42651093ee43 *ff-stat

1 0