May 2012 - ffmpeg-cvslog - lists.ffmpeg.org

fate: dont freopen() stdout
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 02:56:56 2012 +0200| [3b275ce3747a311b05d78eaba41798145164a4d4] | committer: Michael Niedermayer fate: dont freopen() stdout it doesnt work and breaks most BSDs Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b275ce3747a311b0… --- tests/rotozoom.c | 4 ++-- tests/videogen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 296ab70..6604d92 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -165,8 +165,8 @@ int main(int argc, char **argv) return 1; } - if (argc < 3) - err_if(!freopen(NULL, "wb", stdout)); +// if (argc < 3) +// err_if(!freopen(NULL, "wb", stdout)); w = DEFAULT_WIDTH; h = DEFAULT_HEIGHT; diff --git a/tests/videogen.c b/tests/videogen.c index aa4b767..396c1e8 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -152,8 +152,8 @@ int main(int argc, char **argv) exit(1); } - if (argc < 2) - err_if(!freopen(NULL, "wb", stdout)); +// if (argc < 2) +// err_if(!freopen(NULL, "wb", stdout)); w = DEFAULT_WIDTH; h = DEFAULT_HEIGHT;

1 0

range coder test code: decoding errors are av_log_error not debug.
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 00:48:29 2012 +0200| [0dfcd7e7e37e70347285dae9a0ad8ec3ef0f93d2] | committer: Michael Niedermayer range coder test code: decoding errors are av_log_error not debug. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dfcd7e7e37e70347… --- libavcodec/rangecoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index ef9a090..1a15b7f 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -148,7 +148,7 @@ STOP_TIMER("put_rac") for(i=0; i<SIZE; i++){ START_TIMER if( (r[i]&1) != get_rac(&c, state) ) - av_log(NULL, AV_LOG_DEBUG, "rac failure at %d\n", i); + av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i); STOP_TIMER("get_rac") }

1 0

ffv1: fix reading global header with CRC
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 00:47:36 2012 +0200| [21fdf1ccf0a17410943454a48764ee2b05d4b1ac] | committer: Michael Niedermayer ffv1: fix reading global header with CRC Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21fdf1ccf0a174109… --- libavcodec/ffv1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 901e79e..bffd744 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1697,8 +1697,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) + if(f->version > 2) { + c->bytestream_end -= 4; f->minor_version= get_symbol(c, state, 0); + } f->ac= f->avctx->coder_type= get_symbol(c, state, 0); if(f->ac>1){ for(i=1; i<256; i++){

1 0

libavformat: ff_get_bmp_header: return esize too
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 00:46:02 2012 +0200| [76853a3e0ce4d4ef09ffcca7307991b8db832cd4] | committer: Michael Niedermayer libavformat: ff_get_bmp_header: return esize too Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76853a3e0ce4d4ef0… --- libavformat/avidec.c | 3 ++- libavformat/riff.c | 5 +++-- libavformat/riff.h | 2 +- libavformat/wtvdec.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7057a91..1638e28 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -578,6 +578,7 @@ static int avi_read_header(AVFormatContext *s) avio_skip(pb, size); } else { uint64_t cur_pos = avio_tell(pb); + unsigned esize; if (cur_pos < list_end) size = FFMIN(size, list_end - cur_pos); st = s->streams[stream_index]; @@ -591,7 +592,7 @@ static int avi_read_header(AVFormatContext *s) avio_skip(pb, size); break; } - tag1 = ff_get_bmp_header(pb, st); + tag1 = ff_get_bmp_header(pb, st, &esize); if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; diff --git a/libavformat/riff.c b/libavformat/riff.c index add8440..1266f8b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -653,10 +653,11 @@ enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps) return id; } -int ff_get_bmp_header(AVIOContext *pb, AVStream *st) +int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize) { int tag1; - avio_rl32(pb); /* size */ + if(esize) *esize = avio_rl32(pb); + else avio_rl32(pb); st->codec->width = avio_rl32(pb); st->codec->height = (int32_t)avio_rl32(pb); avio_rl16(pb); /* planes */ diff --git a/libavformat/riff.h b/libavformat/riff.h index 67521e2..78516df 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -44,7 +44,7 @@ void ff_end_tag(AVIOContext *pb, int64_t start); * bits_per_encoded_sample fields. Does not read extradata. * @return codec tag */ -int ff_get_bmp_header(AVIOContext *pb, AVStream *st); +int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize); void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc); diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index e25bb5f..9157042 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -522,7 +522,7 @@ static int parse_videoinfoheader2(AVFormatContext *s, AVStream *st) AVIOContext *pb = wtv->pb; avio_skip(pb, 72); // picture aspect ratio is unreliable - ff_get_bmp_header(pb, st); + ff_get_bmp_header(pb, st, NULL); return 72 + 40; }

1 0

avidec: fix odd extradata size case.
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 00:46:47 2012 +0200| [57778f61d0ae2059ed95567f8e5b568fa817d33e] | committer: Michael Niedermayer avidec: fix odd extradata size case. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57778f61d0ae2059e… --- libavformat/avidec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 1638e28..24aacd0 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -602,7 +602,8 @@ static int avi_read_header(AVFormatContext *s) } if(size > 10*4 && size<(1<<30) && size < avi->fsize){ - st->codec->extradata_size= size - 10*4; + if(esize == size-1 && (esize&1)) st->codec->extradata_size= esize - 10*4; + else st->codec->extradata_size= size - 10*4; st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) { st->codec->extradata_size= 0;

1 0

[ffmpeg-web] branch master updated. af32291 web: download: The new URL for Debian package is deb-multimedia.org (was debian-multimedia.org)
by ffmpeg-cvslog＠ffmpeg.org 30 May '12

30 May '12

The branch, master has been updated via af322912a60b898939ea2668e9ed6ab7976b7cbe (commit) from 0f55014a325e8b9d787c6bc80949960e5e7af56e (commit) - Log ----------------------------------------------------------------- commit af322912a60b898939ea2668e9ed6ab7976b7cbe Author: Christian Marillat <marillat(a)debian.org> AuthorDate: Wed May 30 17:34:25 2012 +0200 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Wed May 30 17:34:25 2012 +0200 web: download: The new URL for Debian package is deb-multimedia.org (was debian-multimedia.org) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> diff --git a/src/download b/src/download index 42b9a99..5b9de4e 100644 --- a/src/download +++ b/src/download @@ -249,7 +249,7 @@ bootstrap your local repository. <p> FFmpeg Debian packages for oldstable/stable/testing/unstable amd64, i386, powerpc, sparc, ia64, armel, mips, mipsel arches are available at -<a href="http://www.debian-multimedia.org/">http://www.debian-multimedia.org/</a> +<a href="http://www.deb-multimedia.org/">http://www.deb-multimedia.org/</a> </p> <p> ----------------------------------------------------------------------- Summary of changes: src/download | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive --

2 1

avprobe: correctly set the default formatter
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue May 29 13:14:10 2012 -0700| [43b50e62c430adca04d26901b3c957fd9ea0e453] | committer: Luca Barbato avprobe: correctly set the default formatter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43b50e62c430adca0… --- avprobe.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/avprobe.c b/avprobe.c index 3a0ee28..2464f86 100644 --- a/avprobe.c +++ b/avprobe.c @@ -933,6 +933,16 @@ int main(int argc, char **argv) #endif show_banner(); + + octx.print_header = ini_print_header; + octx.print_footer = ini_print_footer; + + octx.print_array_header = ini_print_array_header; + octx.print_object_header = ini_print_object_header; + + octx.print_integer = ini_print_integer; + octx.print_string = ini_print_string; + parse_options(NULL, argc, argv, options, opt_input_file); if (!input_filename) { @@ -949,15 +959,6 @@ int main(int argc, char **argv) if (!probe_out) exit(1); - octx.print_header = ini_print_header; - octx.print_footer = ini_print_footer; - - octx.print_array_header = ini_print_array_header; - octx.print_object_header = ini_print_object_header; - - octx.print_integer = ini_print_integer; - octx.print_string = ini_print_string; - probe_header(); ret = probe_file(input_filename); probe_footer();

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed May 30 19:32:06 2012 +0200| [a1fc1d2e1b4a5bcfd07549dce9735f24237aa32e] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: pcm-mpeg: improve log message wording fate: add missing $(TARGET_PATH) to ac3-fixed-encode fate: fix md5sum replacement on some systems avprobe: correctly set the default formatter lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs lavr: add C functions for mixing 2 to 1 channels with s16p format avprobe: move formatter functions in the context Conflicts: ffprobe.c libavcodec/pcm-mpeg.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1fc1d2e1b4a5bcfd… ---

1 0

pcm-mpeg: improve log message wording
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Christian Schmidt <schmidt(a)digadd.de> | Wed May 30 11:40:23 2012 +0000| [d041dec3cba300aef6e489990be7242dcd808441] | committer: Derek Buitenhuis pcm-mpeg: improve log message wording We support every defined value for channel layout, bitrate and sample depth. All other values are not unsupported, but reserved. Update comments to say "are used" instead of "are known or exist". Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d041dec3cba300aef… --- libavcodec/pcm-mpeg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 8340715..014fc91 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -70,14 +70,14 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, /* get the sample depth and derive the sample format from it */ avctx->bits_per_coded_sample = bits_per_samples[header[3] >> 6]; if (!avctx->bits_per_coded_sample) { - av_log(avctx, AV_LOG_ERROR, "unsupported sample depth (0)\n"); + av_log(avctx, AV_LOG_ERROR, "reserved sample depth (0)\n"); return -1; } avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16 : AV_SAMPLE_FMT_S32; avctx->bits_per_raw_sample = avctx->bits_per_coded_sample; - /* get the sample rate. Not all values are known or exist. */ + /* get the sample rate. Not all values are used. */ switch (header[2] & 0x0f) { case 1: avctx->sample_rate = 48000; @@ -90,13 +90,13 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, break; default: avctx->sample_rate = 0; - av_log(avctx, AV_LOG_ERROR, "unsupported sample rate (%d)\n", + av_log(avctx, AV_LOG_ERROR, "reserved sample rate (%d)\n", header[2] & 0x0f); return -1; } /* - * get the channel number (and mapping). Not all values are known or exist. + * get the channel number (and mapping). Not all values are used. * It must be noted that the number of channels in the MPEG stream can * differ from the actual meaningful number, e.g. mono audio still has two * channels, one being empty. @@ -104,7 +104,7 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, avctx->channel_layout = channel_layouts[channel_layout]; avctx->channels = channels[channel_layout]; if (!avctx->channels) { - av_log(avctx, AV_LOG_ERROR, "unsupported channel configuration (%d)\n", + av_log(avctx, AV_LOG_ERROR, "reserved channel configuration (%d)\n", channel_layout); return -1; }

1 0

fate: add missing $(TARGET_PATH) to ac3-fixed-encode
by git＠videolan.org 30 May '12

30 May '12

ffmpeg | branch: master | Mans Rullgard <mans(a)mansr.com> | Wed May 30 05:17:50 2012 +0100| [0857e46dd5f6d4d9b9b946492fe0c951485bdbe7] | committer: Mans Rullgard fate: add missing $(TARGET_PATH) to ac3-fixed-encode Signed-off-by: Mans Rullgard <mans(a)mansr.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0857e46dd5f6d4d9b… --- tests/fate/ac3.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 5e5d06a..4fafb05 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -48,7 +48,7 @@ fate-eac3-encode: FUZZ = 3 FATE_AC3 += fate-ac3-fixed-encode fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav -fate-ac3-fixed-encode: SRC = tests/data/asynth-44100-2.wav +fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1

1 0