March 2015 - ffmpeg-cvslog - lists.ffmpeg.org

qsv: Skip header compilation depending on what parts of qsv are enabled
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Sun Mar 29 13:49:44 2015 +0200| [7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161] | committer: Diego Biurrun qsv: Skip header compilation depending on what parts of qsv are enabled > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d3183d3a4e800ab7… --- libavcodec/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a29927f..39158f3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -724,7 +724,9 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h -SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h qsv_internal.h +SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h +SKIPHEADERS-$(CONFIG_QSVDEC) += qsvdec.h +SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h

1 0

tiff: Return more meaningful error codes
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Himangi Saraogi <himangi774(a)gmail.com> | Mon Mar 30 22:42:06 2015 +0530| [0187c2ccda3b00d22797170bf5675318dd0f675a] | committer: Michael Niedermayer tiff: Return more meaningful error codes Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0187c2ccda3b00d22… --- libavcodec/tiffenc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 44cd956..2cdac0b 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -164,7 +164,8 @@ static int add_entry1(TiffEncoderContext *s, * @param dst output buffer * @param n size of input buffer * @param compr compression method - * @return number of output bytes. If an output error is encountered, -1 is returned + * @return number of output bytes. If an output error is encountered, a negative + * value corresponding to an AVERROR error code is returned. */ static int encode_strip(TiffEncoderContext *s, const int8_t *src, uint8_t *dst, int n, int compr) @@ -177,14 +178,14 @@ static int encode_strip(TiffEncoderContext *s, const int8_t *src, unsigned long zlen = s->buf_size - (*s->buf - s->buf_start); if (compress(dst, &zlen, src, n) != Z_OK) { av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n"); - return -1; + return AVERROR_EXTERNAL; } return zlen; } #endif case TIFF_RAW: if (check_size(s, n)) - return -1; + return AVERROR(EINVAL); memcpy(dst, src, n); return n; case TIFF_PACKBITS: @@ -193,7 +194,9 @@ static int encode_strip(TiffEncoderContext *s, const int8_t *src, case TIFF_LZW: return ff_lzw_encode(s->lzws, src, n); default: - return -1; + av_log(s->avctx, AV_LOG_ERROR, "Unsupported compression method: %d\n", + compr); + return AVERROR(EINVAL); } } @@ -304,7 +307,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, default: av_log(s->avctx, AV_LOG_ERROR, "This colors format is not supported\n"); - return -1; + return AVERROR(EINVAL); } for (i = 0; i < s->bpp_tab_size; i++)

1 0

libavformat/mxfenc.c: Add 'Presentation Y offset' metadata
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Tim Nicholson <tim.nicholson(a)bbc.co.uk> | Mon Mar 30 11:11:17 2015 +0100| [ac9919b9662f28816cf79c1d5c36719160009588] | committer: Michael Niedermayer libavformat/mxfenc.c: Add 'Presentation Y offset' metadata Previously unset, and some software mishandles files if it is absent Signed-off-by: Tim Nicholson <tim.nicholson(a)bbc.co.uk> Reviewed-by: tomas.hardin(a)codemill.se Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac9919b9662f28816… --- libavformat/mxfenc.c | 7 ++++++- tests/ref/lavf/mxf | 6 +++--- tests/ref/lavf/mxf_d10 | 2 +- tests/ref/lavf/mxf_opatom | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index ac60357..7b400b3 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -406,6 +406,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x02,0x01,0x00,0x00,0x00}}, /* Stored Height */ { 0x3209, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0C,0x00,0x00,0x00}}, /* Display Width */ { 0x3208, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0B,0x00,0x00,0x00}}, /* Display Height */ + { 0x320B, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0E,0x00,0x00,0x00}}, /* Presentation Y offset */ { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */ { 0x3212, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x01,0x06,0x00,0x00,0x00}}, /* Field Dominance (Opt) */ @@ -978,7 +979,7 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke int stored_height = (st->codec->height+15)/16*16; int display_height; int f1, f2; - unsigned desc_size = size+8+8+8+8+8+8+5+16+sc->interlaced*4+12+20; + unsigned desc_size = size+8+8+8+8+8+8+8+5+16+sc->interlaced*4+12+20; if (sc->interlaced && sc->field_dominance) desc_size += 5; @@ -1003,6 +1004,10 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke mxf_write_local_tag(pb, 4, 0x3208); avio_wb32(pb, display_height>>sc->interlaced); + // presentation Y offset + mxf_write_local_tag(pb, 4, 0x320B); + avio_wb32(pb, (st->codec->height - display_height)>>sc->interlaced); + // component depth mxf_write_local_tag(pb, 4, 0x3301); avio_wb32(pb, sc->component_depth); diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 8ead434..5fb984b 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -306708cc2ad2414def89fa2f3c0bfc5c *./tests/data/lavf/lavf.mxf +613b160bf09927661d9455dd975ad780 *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 -f465084f0c365926a81aab56fb6b945c *./tests/data/lavf/lavf.mxf +64471cfc480751f2ca7998c4edbc7a02 *./tests/data/lavf/lavf.mxf 560697 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x11a6178e -52fc707e1177c97232e2537168c232e6 *./tests/data/lavf/lavf.mxf +a546bd6d8fe1608690bf2fc326cab0c3 *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index 71707ca..8201557 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -8f601d5b55a0665cc105a115dc8b3af0 *./tests/data/lavf/lavf.mxf_d10 +22dca5c8d62fe7ad1c56416ae736d6c1 *./tests/data/lavf/lavf.mxf_d10 5330989 ./tests/data/lavf/lavf.mxf_d10 ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 5529e5b..0dd59c1 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -0f753a141424e2a1b44e6390f70172eb *./tests/data/lavf/lavf.mxf_opatom +5df0bb1083cbe0ef3a70e4a93e44d812 *./tests/data/lavf/lavf.mxf_opatom 4717113 ./tests/data/lavf/lavf.mxf_opatom ./tests/data/lavf/lavf.mxf_opatom CRC=0xbdd696b9

1 0

avformat/nutdec: Use av_malloc_array()
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 04:32:58 2015 +0200| [4a1081161704eabb65a5aa0569172bae9f423dca] | committer: Michael Niedermayer avformat/nutdec: Use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a1081161704eabb6… --- libavformat/nutdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 00e86bb..5b243dc 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -248,7 +248,7 @@ static int decode_main_header(NUTContext *nut) } GET_V(nut->time_base_count, tmp > 0 && tmp < INT_MAX / sizeof(AVRational)); - nut->time_base = av_malloc(nut->time_base_count * sizeof(AVRational)); + nut->time_base = av_malloc_array(nut->time_base_count, sizeof(AVRational)); if (!nut->time_base) return AVERROR(ENOMEM);

1 0

avutil/pca: Check for av_malloc* failures
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 04:37:42 2015 +0200| [dadc43eee4d9036aa532665a04720238cc15e922] | committer: Michael Niedermayer avutil/pca: Check for av_malloc* failures Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dadc43eee4d9036aa… --- libavutil/pca.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/pca.c b/libavutil/pca.c index f7ae350..1d88ff3 100644 --- a/libavutil/pca.c +++ b/libavutil/pca.c @@ -41,12 +41,20 @@ PCA *ff_pca_init(int n){ return NULL; pca= av_mallocz(sizeof(*pca)); + if (!pca) + return NULL; + pca->n= n; pca->z = av_malloc_array(n, sizeof(*pca->z)); pca->count=0; pca->covariance= av_calloc(n*n, sizeof(double)); pca->mean= av_calloc(n, sizeof(double)); + if (!pca->z || !pca->covariance || !pca->mean) { + ff_pca_free(pca); + return NULL; + } + return pca; }

1 0

[ffmpeg-web] branch master updated. 9228968 web/download: Add FFmpeg 2.4.8
by ffmpeg-cvslog＠ffmpeg.org 30 Mar '15

30 Mar '15

The branch, master has been updated via 922896875558b66a9f25f9998de5d3d4ce0ee397 (commit) from 6d56786ec0ee1f895552656c658e2974ae8534df (commit) - Log ----------------------------------------------------------------- commit 922896875558b66a9f25f9998de5d3d4ce0ee397 Author: Michael Niedermayer <michaelni(a)gmx.at> AuthorDate: Mon Mar 30 02:40:54 2015 +0200 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Mon Mar 30 02:40:54 2015 +0200 web/download: Add FFmpeg 2.4.8 diff --git a/src/download b/src/download index c166560..c55d765 100644 --- a/src/download +++ b/src/download @@ -347,13 +347,13 @@ libpostproc 53. 3.100</pre> <a name="release_2.4"></a><h3> - FFmpeg 2.4.7 "Fresnel"</h3> + FFmpeg 2.4.8 "Fresnel"</h3> <p> - 2.4.7 was released on 2015-02-15. It is the latest stable FFmpeg release + 2.4.8 was released on 2015-03-30. It is the latest stable FFmpeg release from the 2.4 release branch, which was cut from master on 2014-09-14. Amongst lots of other changes, it includes all changes from - ffmpeg-mt, libav master of 2014-09-14, libav 11.2 as of 2015-02-14. + ffmpeg-mt, libav master of 2014-09-14, libav 11.3 as of 2015-03-30. </p> <p>It includes the following library versions: </p> @@ -370,15 +370,15 @@ libpostproc 53. 0.100</pre> <div class="row"> <div class="col-md-4"> - <a class="btn btn-success" href="releases/ffmpeg-2.4.7.tar.bz2">Download bzip2 tarball</a> - <small><a href="releases/ffmpeg-2.4.7.tar.bz2.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-2.4.8.tar.bz2">Download bzip2 tarball</a> + <small><a href="releases/ffmpeg-2.4.8.tar.bz2.asc">PGP signature</a></small> </div>  <div class="col-md-4"> - <a class="btn btn-success" href="releases/ffmpeg-2.4.7.tar.gz">Download gzip tarball</a> - <small><a href="releases/ffmpeg-2.4.7.tar.gz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-2.4.8.tar.gz">Download gzip tarball</a> + <small><a href="releases/ffmpeg-2.4.8.tar.gz.asc">PGP signature</a></small> </div>  <div class="col-md-4 text-right"> - <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.4.7">Changelog</a></small> + <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.4.8">Changelog</a></small> <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.4">Release Notes</a> </div>  </div>  ----------------------------------------------------------------------- Summary of changes: src/download | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

1 0

Tag n2.4.8 : FFmpeg 2.4.8 release
by git＠videolan.org 30 Mar '15

30 Mar '15

[ffmpeg] [branch: refs/tags/n2.4.8] Tag: b2ecd037138c9aa490909228b6b225ec1cb39934 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=b2ecd037138c9aa490909… Tagger: Michael Niedermayer <michaelni(a)gmx.at> Date: Mon Mar 30 02:09:19 2015 +0200 FFmpeg 2.4.8 release

1 0

Update for 2.4.8
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 01:28:28 2015 +0200| [2c8c55195da97ee45fb0daf6d68c22b942e14ade] | committer: Michael Niedermayer Update for 2.4.8 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c8c55195da97ee45… --- Changelog | 39 +++++++++++++++++++++++++++++++++++++++ RELEASE | 2 +- doc/Doxyfile | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 2371d9d..43639ae 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,45 @@ releases are sorted from youngest to oldest. version <next>: +version 2.4.8: +- avutil/cpu: add missing check for mmxext to av_force_cpu_flags +- avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer +- avcodec/hevc_ps: Check cropping parameters more correctly +- avcodec/dnxhddec: Check that the frame is interlaced before using cur_field +- avformat/mov: Disallow ".." in dref unless use_absolute_path is set +- avformat/mov: Check for string truncation in mov_open_dref() +- ac3_fixed: fix out-of-bound read +- avcodec/012v: redesign main loop +- avcodec/012v: Check dimensions more completely +- asfenc: fix leaking asf->index_ptr on error +- avcodec/options_table: remove extradata_size from the AVOptions table +- ffmdec: limit the backward seek to the last resync position +- ffmdec: make sure the time base is valid +- ffmdec: fix infinite loop at EOF +- avcodec/tiff: move bpp check to after "end:" +- avcodec/opusdec: Fix delayed sample value +- avcodec/utils: Align YUV411 by as much as the other YUV variants +- vp9: fix segmentation map retention with threading enabled. +- doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds +- fix VP9 packet decoder returning 0 instead of the used data size +- avformat/bit: only accept the g729 codec and 1 channel +- avformat/adxdec: check avctx->channels for invalid values +- Fix buffer_size argument to init_put_bits() in multiple encoders. +- mips/acelp_filters: fix incorrect register constraint +- avcodec/hevc_ps: Sanity checks for some log2_* values +- avcodec/zmbv: Check len before reading in decode_frame() +- avcodec/snowdec: Fix ref value check +- swscale/utils: More carefully merge and clear coefficients outside the input +- avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop +- avcodec/a64multienc: don't set incorrect packet size +- webp: ensure that each transform is only used once +- avcodec/hevc_ps: More complete window reset +- vp9: make above buffer pointer 32-byte aligned. +- avformat/rm: limit packet size +- avcodec/webp: validate the distance prefix code +- avcodec/gif: fix off by one in column offsetting finding + + version 2.4.7: - avcodec/flac_parser: fix handling EOF if no headers are found - avfilter/vf_framepack: Check and update frame_rate diff --git a/RELEASE b/RELEASE index e30309f..f041bc6 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -2.4.7 +2.4.8 diff --git a/doc/Doxyfile b/doc/Doxyfile index c81c799..3f942b5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.4.7 +PROJECT_NUMBER = 2.4.8 # With the PROJECT_LOGO tag one can specify a logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55

1 0

avformat/img2: Change enum to int, which is accessed via AVOption as int
by git＠videolan.org 29 Mar '15

29 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 23 19:31:17 2015 +0100| [7c6b0436b645bfe5e57a7c8420ab4c119cbd544e] | committer: Michael Niedermayer avformat/img2: Change enum to int, which is accessed via AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c6b0436b645bfe5e… --- libavformat/img2.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/img2.h b/libavformat/img2.h index 67bd7a3..e4bcb26 100644 --- a/libavformat/img2.h +++ b/libavformat/img2.h @@ -30,6 +30,12 @@ #include <glob.h> #endif +enum PatternType { + PT_GLOB_SEQUENCE, + PT_GLOB, + PT_SEQUENCE +}; + typedef struct VideoDemuxData { const AVClass *class; /**< Class for private options. */ int img_first; @@ -44,7 +50,7 @@ typedef struct VideoDemuxData { int width, height; /**< Set by a private option. */ AVRational framerate; /**< Set by a private option. */ int loop; - enum { PT_GLOB_SEQUENCE, PT_GLOB, PT_SEQUENCE } pattern_type; + int pattern_type; /**< PatternType */ int use_glob; #if HAVE_GLOB glob_t globstate;

1 0

avformat/wavenc: Change enum to int, which is accessed via AVOption as int
by git＠videolan.org 29 Mar '15

29 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 23 19:31:17 2015 +0100| [f45758d3eebecd2c4f5bac456e05f0063e20114d] | committer: Michael Niedermayer avformat/wavenc: Change enum to int, which is accessed via AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f45758d3eebecd2c4… --- libavformat/wavenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 2345fc5..0333622 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -82,7 +82,7 @@ typedef struct WAVMuxContext { int write_peak; int rf64; int peak_block_size; - PeakFormat peak_format; + int peak_format; int peak_block_pos; int peak_ppv; int peak_bps;

1 0