August 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [49f434ce2e5e57c57d3820330382e9c85f587086] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49f434ce2e5e57c57… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 9c13f43..7f64e9a 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1280,7 +1280,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

[ffmpeg-web] branch master updated. d3a155a web/olddownload: add 1.1.6
by ffmpeg-cvslog＠ffmpeg.org 31 Aug '13

31 Aug '13

The branch, master has been updated via d3a155a50045c006e3f74fda74c4fc523afc580e (commit) from c3c8204fc64f493291dc3a63e13aa498c61f53c9 (commit) - Log ----------------------------------------------------------------- commit d3a155a50045c006e3f74fda74c4fc523afc580e Author: Michael Niedermayer <michaelni(a)gmx.at> AuthorDate: Sat Aug 31 06:03:41 2013 +0200 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Sat Aug 31 06:03:41 2013 +0200 web/olddownload: add 1.1.6 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> diff --git a/src/olddownload b/src/olddownload index 522c691..e535ea9 100644 --- a/src/olddownload +++ b/src/olddownload @@ -1,13 +1,13 @@ <a name="oldreleases"></a><h1>Old FFmpeg Releases</h1> <a name="release_1.1"></a><h2> -FFmpeg 1.1.5 "Fire Flower"</h2> +FFmpeg 1.1.6 "Fire Flower"</h2> <p> -1.1.5 was released on 2013-05-13. It is the latest stable FFmpeg release +1.1.6 was released on 2013-08-31. It is the latest stable FFmpeg release from the 1.1 release branch, which was cut from master on 2013-01-06. Amongst lots of other changes, it includes all changes from -ffmpeg-mt, libav master of 2013-01-06, libav 9.5 as of 2013-05-12. +ffmpeg-mt, libav master of 2013-01-06, libav 9.8 as of 2013-08-31. </p> <p>It includes the following library versions: </p> @@ -23,11 +23,11 @@ ffmpeg-mt, libav master of 2013-01-06, libav 9.5 as of 2013-05-12. </pre> <p> -<a href="releases/ffmpeg-1.1.5.tar.bz2">Download bzip2 tarball</a>   -<a href="releases/ffmpeg-1.1.5.tar.bz2.asc">PGP signature</a><br /> -<a href="releases/ffmpeg-1.1.5.tar.gz">Download gzip tarball</a>   -<a href="releases/ffmpeg-1.1.5.tar.gz.asc">PGP signature</a><br /> -<a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.1.5">Changelog</a><br /> +<a href="releases/ffmpeg-1.1.6.tar.bz2">Download bzip2 tarball</a>   +<a href="releases/ffmpeg-1.1.6.tar.bz2.asc">PGP signature</a><br /> +<a href="releases/ffmpeg-1.1.6.tar.gz">Download gzip tarball</a>   +<a href="releases/ffmpeg-1.1.6.tar.gz.asc">PGP signature</a><br /> +<a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.1.6">Changelog</a><br /> </p> <a name="release_1.0"></a><h2> ----------------------------------------------------------------------- Summary of changes: src/olddownload | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

1 0

Tag n1.1.6 : FFmpeg 1.1.6 release
by git＠videolan.org 31 Aug '13

31 Aug '13

[ffmpeg] [branch: refs/tags/n1.1.6] Tag: 2d88bcb6743acd4ba66e421aaa4890211f304116 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=2d88bcb6743acd4ba66e4… Tagger: Michael Niedermayer <michaelni(a)gmx.at> Date: Sat Aug 31 05:57:23 2013 +0200 FFmpeg 1.1.6 release

1 0

update for 1.1.6
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 04:55:35 2013 +0200| [86bf0a8871dfd447709232fc1f4b48e524c9e6df] | committer: Michael Niedermayer update for 1.1.6 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86bf0a8871dfd4477… --- RELEASE | 2 +- VERSION | 2 +- doc/Doxyfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE b/RELEASE index e25d8d9..0664a8f 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1.1.5 +1.1.6 diff --git a/VERSION b/VERSION index e25d8d9..0664a8f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.5 +1.1.6 diff --git a/doc/Doxyfile b/doc/Doxyfile index d4b93f5..daf30c0 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 = 1.1.5 +PROJECT_NUMBER = 1.1.6 # With the PROJECT_LOGO tag one can specify an logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55

1 0

avcodec/dsputil: fix signedness in sizeof() comparissions
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:40:47 2013 +0200| [558d0b9483d0eecf9718986516c00b696541c693] | committer: Michael Niedermayer avcodec/dsputil: fix signedness in sizeof() comparissions Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=558d0b9483d0eecf9… --- libavcodec/dsputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 7314215..b1b0c0c 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1922,7 +1922,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type){ static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){ long i; - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ long a = *(long*)(src+i); long b = *(long*)(dst+i); *(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80); @@ -1947,7 +1947,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, } }else #endif - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ long a = *(long*)(src1+i); long b = *(long*)(src2+i); *(long*)(dst+i) = ((a|pb_80) - (b&pb_7f)) ^ ((a^b^pb_80)&pb_80);

1 0

ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/ 1 headers
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 06:08:32 2013 +0200| [f78a3868fd3d8f66da68338c0783aa15f98833bf] | committer: Michael Niedermayer ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit b05cd1ea7e45a836f7f6071a716c38bb30326e0f) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f78a3868fd3d8f66d… --- libavcodec/ffv1dec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 8f5f504..a3afa14 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -528,7 +528,7 @@ static int read_header(FFV1Context *f) memset(state, 128, sizeof(state)); if (f->version < 2) { - int chroma_planes, chroma_h_shift, chroma_v_shift, transparency; + int chroma_planes, chroma_h_shift, chroma_v_shift, transparency, colorspace, bits_per_raw_sample; unsigned v= get_symbol(c, state, 0); if (v >= 2) { av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v); @@ -541,18 +541,17 @@ static int read_header(FFV1Context *f) f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i]; } - f->colorspace = get_symbol(c, state, 0); //YUV cs type - - if (f->version > 0) - f->avctx->bits_per_raw_sample = get_symbol(c, state, 0); - + colorspace = get_symbol(c, state, 0); //YUV cs type + bits_per_raw_sample = f->version > 0 ? get_symbol(c, state, 0) : f->avctx->bits_per_raw_sample; chroma_planes = get_rac(c, state); chroma_h_shift = get_symbol(c, state, 0); chroma_v_shift = get_symbol(c, state, 0); transparency = get_rac(c, state); if (f->plane_count) { - if ( chroma_planes != f->chroma_planes + if ( colorspace != f->colorspace + || bits_per_raw_sample != f->avctx->bits_per_raw_sample + || chroma_planes != f->chroma_planes || chroma_h_shift!= f->chroma_h_shift || chroma_v_shift!= f->chroma_v_shift || transparency != f->transparency) { @@ -561,6 +560,8 @@ static int read_header(FFV1Context *f) } } + f->colorspace = colorspace; + f->avctx->bits_per_raw_sample = bits_per_raw_sample; f->chroma_planes = chroma_planes; f->chroma_h_shift = chroma_h_shift; f->chroma_v_shift = chroma_v_shift;

1 0

ffv1dec: check that global parameters dont change in version 0/1
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 04:51:09 2013 +0200| [df2fc635439df6d5ab84d50ae96acb0da07f941e] | committer: Michael Niedermayer ffv1dec: check that global parameters dont change in version 0/1 Such changes are not allowed nor supported Fixes Ticket2906 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 547d690d676064069d44703a1917e0dab7e33445) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df2fc635439df6d5a… --- libavcodec/ffv1dec.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 69930d8..8f5f504 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -528,6 +528,7 @@ static int read_header(FFV1Context *f) memset(state, 128, sizeof(state)); if (f->version < 2) { + int chroma_planes, chroma_h_shift, chroma_v_shift, transparency; unsigned v= get_symbol(c, state, 0); if (v >= 2) { av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v); @@ -545,10 +546,26 @@ static int read_header(FFV1Context *f) if (f->version > 0) f->avctx->bits_per_raw_sample = get_symbol(c, state, 0); - f->chroma_planes = get_rac(c, state); - f->chroma_h_shift = get_symbol(c, state, 0); - f->chroma_v_shift = get_symbol(c, state, 0); - f->transparency = get_rac(c, state); + chroma_planes = get_rac(c, state); + chroma_h_shift = get_symbol(c, state, 0); + chroma_v_shift = get_symbol(c, state, 0); + transparency = get_rac(c, state); + + if (f->plane_count) { + if ( chroma_planes != f->chroma_planes + || chroma_h_shift!= f->chroma_h_shift + || chroma_v_shift!= f->chroma_v_shift + || transparency != f->transparency) { + av_log(f->avctx, AV_LOG_ERROR, "Invalid change of global parameters\n"); + return AVERROR_INVALIDDATA; + } + } + + f->chroma_planes = chroma_planes; + f->chroma_h_shift = chroma_h_shift; + f->chroma_v_shift = chroma_v_shift; + f->transparency = transparency; + f->plane_count = 2 + f->transparency; }

1 0

avcodec/ffv1dec: check global header version
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 03:43:49 2013 +0200| [890c36d7ff1a12641c9fe5c84db4398dfb493fc5] | committer: Michael Niedermayer avcodec/ffv1dec: check global header version Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 20b965a1a43ae88b7ae95635d5a3570e7dc2bbd4) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=890c36d7ff1a12641… --- libavcodec/ffv1dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index a1da544..69930d8 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -447,6 +447,10 @@ static int read_extra_header(FFV1Context *f) ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8); f->version = get_symbol(c, state, 0); + if (f->version < 2) { + av_log(f->avctx, AV_LOG_ERROR, "Invalid version in global header\n"); + return AVERROR_INVALIDDATA; + } if (f->version > 2) { c->bytestream_end -= 4; f->minor_version = get_symbol(c, state, 0);

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [227a0eb5a92409572f2cecde6137529b83e7d495] | committer: Michael Niedermayer avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=227a0eb5a92409572… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 2827064..0aaa5a6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1423,7 +1423,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if (first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avcodec/dsputil: fix signedness in sizeof() comparissions
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:40:47 2013 +0200| [454a11a1c9c686c78aa97954306fb63453299760] | committer: Michael Niedermayer avcodec/dsputil: fix signedness in sizeof() comparissions Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=454a11a1c9c686c78… --- libavcodec/dsputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 0161347..53fd572 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1931,7 +1931,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type){ static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){ long i; - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ long a = *(long*)(src+i); long b = *(long*)(dst+i); *(long*)(dst+i) = ((a&pb_7f) + (b&pb_7f)) ^ ((a^b)&pb_80); @@ -1956,7 +1956,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, } }else #endif - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){ + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){ long a = *(long*)(src1+i); long b = *(long*)(src2+i); *(long*)(dst+i) = ((a|pb_80) - (b&pb_7f)) ^ ((a^b^pb_80)&pb_80);

1 0