August 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0; "
by Michael Niedermayer 14 Aug '13

14 Aug '13

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/wavpackenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index 1a4f252..3cc74bd 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2049,7 +2049,7 @@ static void wavpack_encode_sample(WavPackEncodeContext *s, WvChannel *c, int32_t { WavPackWords *w = &s->w; uint32_t ones_count, low, high; - int sign = ((sample) < 0) ? 1 : 0; + int sign = sample < 0; if (s->w.c[0].median[0] < 2 && !s->w.holding_zero && s->w.c[1].median[0] < 2) { if (w->zeros_acc) { -- 1.7.9.5

1 1

[PATCH] lavf/wavdec: Fix seeking in files with unaligned offsets
by Alexander Strasser 14 Aug '13

14 Aug '13

A file with a prepended ID3 tag of an uneven length was found in the wild. Check if the wav data starts at an uneven offset and use that information to correct the seeking calculation in wav_seek_tag, which used to only seek to even byte positions. Regression since ac87eaf856e0fb51917266b899bb15d19b907baf Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> --- Please comment or tell me if you have better ideas. The commit causing the regression fixed some other (wrongly coded?) files I think. The bug was reported (including a sample) here: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/47235 libavformat/wavdec.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index adf41ec..d5b3b9e 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -54,6 +54,7 @@ typedef struct WAVDemuxContext { int spdif; int smv_cur_pt; int smv_given_first; + int unaligned; // e.g. if an odd number of bytes ID3 tag was prepended } WAVDemuxContext; #if CONFIG_WAV_DEMUXER @@ -64,16 +65,16 @@ static int64_t next_tag(AVIOContext *pb, uint32_t *tag) return avio_rl32(pb); } -/* RIFF chunks are always on a even offset. */ -static int64_t wav_seek_tag(AVIOContext *s, int64_t offset, int whence) +/* RIFF chunks are always at even offsets relative to where they start. */ +static int64_t wav_seek_tag(WAVDemuxContext * wav, AVIOContext *s, int64_t offset, int whence) { - offset += offset < INT64_MAX && offset & 1; + offset += offset < INT64_MAX && offset + wav->unaligned & 1; return avio_seek(s, offset, whence); } /* return the size of the found tag */ -static int64_t find_tag(AVIOContext *pb, uint32_t tag1) +static int64_t find_tag(WAVDemuxContext * wav, AVIOContext *pb, uint32_t tag1) { unsigned int tag; int64_t size; @@ -84,7 +85,7 @@ static int64_t find_tag(AVIOContext *pb, uint32_t tag1) size = next_tag(pb, &tag); if (tag == tag1) break; - wav_seek_tag(pb, size, SEEK_CUR); + wav_seek_tag(wav, pb, size, SEEK_CUR); } return size; } @@ -247,6 +248,8 @@ static int wav_read_header(AVFormatContext *s) int ret, got_fmt = 0; int64_t next_tag_ofs, data_ofs = -1; + wav->unaligned = avio_tell(s->pb) & 1; + wav->smv_data_ofs = -1; /* check RIFF header */ @@ -383,7 +386,7 @@ static int wav_read_header(AVFormatContext *s) /* seek to next tag unless we know that we'll run into EOF */ if ((avio_size(pb) > 0 && next_tag_ofs >= avio_size(pb)) || - wav_seek_tag(pb, next_tag_ofs, SEEK_SET) < 0) { + wav_seek_tag(wav, pb, next_tag_ofs, SEEK_SET) < 0) { break; } } @@ -511,7 +514,7 @@ smv_out: if (CONFIG_W64_DEMUXER && wav->w64) left = find_guid(s->pb, ff_w64_guid_data) - 24; else - left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a')); + left = find_tag(wav, s->pb, MKTAG('d', 'a', 't', 'a')); if (left < 0) { wav->audio_eof = 1; if (wav->smv_data_ofs > 0 && !wav->smv_eof) --

3 4

Gitignore
by Marcus Johnson 14 Aug '13

14 Aug '13

Could someone add *.DS_Store and *._ to the .gitignore? .DS_Store is used by OS X's finder to store information about the files in the folder (basically the equivalent of Windows Thumbs.db or Desktop.ini) and ._* files are used for extended attributes in OS X as well.

3 3

suggestions for debugging ff_fft_calc_altivec?
by Pavel Koshevoy 14 Aug '13

14 Aug '13

Hi, I've decided to take a closer look at OSX 10.5 PPC build with gas-preprocessor.pl. The last time I tried it more than half a year ago the result was that some audio decoders didn't sound right (AAC, AC3 -- both sound like loud white noise). I tried again today and compared decoder output from builds with and without gas-preprocessor. I've narrowed it down to output of fft_calc_c (called in ff_imdct_half_c) being different from output of ff_fft_calc_altivec (called in imdct_half_altivec). I am not a PPC assembly expert, nor am I familiar with FFT implementation details to be able to easily spot what the problem is with ff_fft_calc_altivec. Can anyone offer some suggestions to proceed further? Thank you, Pavel.

3 4

[RFC] FFmpeg-web: mirror & missing files
by Thilo Borgmann 14 Aug '13

14 Aug '13

Hi, a) it would be nice to also have a mirror on github for the FFmpeg-web repository for submitting pull-requests to the website. If it is not too much effort... b) it seems like at least the texi source for developer.html is missing in the FFmpeg-web repository. I have not checked but maybe more files are missing. -Thilo

2 2

FYI, noticeable decoding performance degradation
by Pavel Koshevoy 14 Aug '13

14 Aug '13

Hi, Please disregard if you are already aware of the drop in decoding speed. I've pulled recent changes on master yesterday up to and including bb4e1b4cf910af0de2bc884c75544603c40010cc. ffplay build from a few days ago could decode a short (11 seconds, 640 kb/s) AC3 file without problems on 800MHz PPC iMac, but yesterdays build stutters throughout playback. Please let me know if I need to provide additional info. Hope this helps, Pavel.

2 3

[PATCH] avcodec/gsmdec: reject unsupported msn audio modes
by Piotr Bandurski 13 Aug '13

13 Aug '13

3 3

[PATCH 1/2] vf_scale: add force_original_aspect_ratio
by Timothy Gu 13 Aug '13

13 Aug '13

--- doc/filters.texi | 15 +++++++++++++++ libavfilter/vf_scale.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index cd59057..d78c4ca 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6373,6 +6373,21 @@ Full range (0-255 in case of 8bit luma) "Mpeg" range (16-235 in case of 8bit luma) @end table +@item force_original_aspect_ratio +Enable decreasing or increasing output video width or height if necessary to +keep the original aspect ratio. If set to 1, it will automatically decrease; +if set to 2, it will increase if needed. + +One useful instance of this option is that when you know a specific device's +maximum allowed resolution, you can use this to limit the output video to +that, while retaining the aspect ratio. For example, device A allows +1280x720 playback, and your video is 1920x800. Using this option (set it to +1) and specifying 1280x720 to the command line makes the output 1280x533. + +Please note that this is a different thing than specifying -1 for @option{w} +or @option{h}, you still need to specify the output resolution for this option +to work. + @end table The values of the @var{w} and @var{h} options are expressions diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 034da5e..21c7244 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -101,6 +101,8 @@ typedef struct { int out_v_chr_pos; int in_h_chr_pos; int in_v_chr_pos; + + int force_original_aspect_ratio; } ScaleContext; static av_cold int init(AVFilterContext *ctx) @@ -274,6 +276,19 @@ static int config_props(AVFilterLink *outlink) if (h == -1) h = av_rescale(w, inlink->h, inlink->w); + if (scale->force_original_aspect_ratio) { + int tmp_w = av_rescale(h, inlink->w, inlink->h); + int tmp_h = av_rescale(w, inlink->h, inlink->w); + + if (scale->force_original_aspect_ratio == 1) { + w = FFMIN(tmp_w, w); + h = FFMIN(tmp_h, h); + } else { + w = FFMAX(tmp_w, w); + h = FFMAX(tmp_h, h); + } + } + if (w > INT_MAX || h > INT_MAX || (h * inlink->w) > INT_MAX || (w * inlink->h) > INT_MAX) @@ -501,6 +516,7 @@ static const AVOption scale_options[] = { { "in_h_chr_pos", "input horizontal chroma position in luma grid/256", OFFSET(in_h_chr_pos), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 512, FLAGS }, { "out_v_chr_pos", "output vertical chroma position in luma grid/256" , OFFSET(out_v_chr_pos), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 512, FLAGS }, { "out_h_chr_pos", "output horizontal chroma position in luma grid/256", OFFSET(out_h_chr_pos), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 512, FLAGS }, + { "force_original_aspect_ratio", "decrease or increase w/h if necessary to keep the original AR", OFFSET(force_original_aspect_ratio), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, FLAGS }, { NULL }, }; -- 1.8.1.2

6 15

[PATCH] tiff: frame multithreading support
by Paul B Mahol 13 Aug '13

13 Aug '13

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavcodec/tiff.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index f4ad773..f3e0b43 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -41,6 +41,7 @@ #include "mathops.h" #include "tiff.h" #include "tiff_data.h" +#include "thread.h" typedef struct TiffContext { AVCodecContext *avctx; @@ -622,7 +623,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, return 0; } -static int init_image(TiffContext *s, AVFrame *frame) +static int init_image(TiffContext *s, ThreadFrame *frame) { int i, ret; uint32_t *pal; @@ -679,14 +680,14 @@ static int init_image(TiffContext *s, AVFrame *frame) return ret; avcodec_set_dimensions(s->avctx, s->width, s->height); } - if ((ret = ff_get_buffer(s->avctx, frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0) return ret; if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (s->palette_is_set) { - memcpy(frame->data[1], s->palette, sizeof(s->palette)); + memcpy(frame->f->data[1], s->palette, sizeof(s->palette)); } else { /* make default grayscale pal */ - pal = (uint32_t *) frame->data[1]; + pal = (uint32_t *) frame->f->data[1]; for (i = 0; i < 1<<s->bpp; i++) pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101; } @@ -1073,6 +1074,7 @@ static int decode_frame(AVCodecContext *avctx, { TiffContext *const s = avctx->priv_data; AVFrame *const p = data; + ThreadFrame frame = { .f = data }; unsigned off; int id, le, ret, plane, planes; int i, j, entries, stride; @@ -1149,7 +1151,7 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } /* now we have the data and may start decoding */ - if ((ret = init_image(s, p)) < 0) + if ((ret = init_image(s, &frame)) < 0) return ret; if (s->strips == 1 && !s->stripsize) { @@ -1288,5 +1290,5 @@ AVCodec ff_tiff_decoder = { .init = tiff_init, .close = tiff_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, }; -- 1.7.11.2

2 4

[PATCH] lavfi/super2xsai: support slice threading
by Paul B Mahol 13 Aug '13

13 Aug '13

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavfilter/vf_super2xsai.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index 4f25968..e94c331 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -46,6 +46,10 @@ typedef struct { int is_be; } Super2xSaIContext; +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + #define GET_RESULT(A, B, C, D) ((A != C || A != D) - (B != C || B != D)) #define INTERPOLATE(A, B) (((A & hi_pixel_mask) >> 1) + ((B & hi_pixel_mask) >> 1) + (A & B & lo_pixel_mask)) @@ -53,32 +57,39 @@ typedef struct { #define Q_INTERPOLATE(A, B, C, D) ((A & q_hi_pixel_mask) >> 2) + ((B & q_hi_pixel_mask) >> 2) + ((C & q_hi_pixel_mask) >> 2) + ((D & q_hi_pixel_mask) >> 2) \ + ((((A & q_lo_pixel_mask) + (B & q_lo_pixel_mask) + (C & q_lo_pixel_mask) + (D & q_lo_pixel_mask)) >> 2) & q_lo_pixel_mask) -static void super2xsai(AVFilterContext *ctx, - uint8_t *src, int src_linesize, - uint8_t *dst, int dst_linesize, - int width, int height) +static int super2xsai(AVFilterContext *ctx, + void *arg, int jobnr, int nb_jobs) { Super2xSaIContext *sai = ctx->priv; + ThreadData *td = arg; + const uint8_t *src = td->in->data[0]; + const int src_linesize = td->in->linesize[0]; + uint8_t *dst = td->out->data[0]; + const int dst_linesize = td->out->linesize[0]; unsigned int x, y; uint32_t color[4][4]; - unsigned char *src_line[4]; + const uint8_t *src_line[4]; const int bpp = sai->bpp; const uint32_t hi_pixel_mask = sai->hi_pixel_mask; const uint32_t lo_pixel_mask = sai->lo_pixel_mask; const uint32_t q_hi_pixel_mask = sai->q_hi_pixel_mask; const uint32_t q_lo_pixel_mask = sai->q_lo_pixel_mask; + const int height = td->in->height; + const int width = td->in->width; + const int start = (height * jobnr ) / nb_jobs; + const int end = (height * (jobnr + 1)) / nb_jobs; /* Point to the first 4 lines, first line is duplicated */ - src_line[0] = src; - src_line[1] = src; - src_line[2] = src + src_linesize*FFMIN(1, height-1); - src_line[3] = src + src_linesize*FFMIN(2, height-1); + src_line[0] = src + src_linesize * start; + src_line[1] = src + src_linesize * start; + src_line[2] = src + src_linesize * FFMIN(start + 1, end - 1); + src_line[3] = src + src_linesize * FFMIN(start + 2, end - 1); #define READ_COLOR4(dst, src_line, off) dst = *((const uint32_t *)src_line + off) #define READ_COLOR3(dst, src_line, off) dst = AV_RL24 (src_line + 3*off) #define READ_COLOR2(dst, src_line, off) dst = sai->is_be ? AV_RB16(src_line + 2 * off) : AV_RL16(src_line + 2 * off) - for (y = 0; y < height; y++) { + for (y = start; y < end; y++) { uint8_t *dst_line[2]; dst_line[0] = dst + dst_linesize*2*y; @@ -226,9 +237,11 @@ static void super2xsai(AVFilterContext *ctx, /* Read next line */ src_line[3] = src_line[2]; - if (y < height - 3) + if (y < end - 3) src_line[3] += src_linesize; } // y loop + + return 0; } static int query_formats(AVFilterContext *ctx) @@ -305,7 +318,9 @@ static int config_output(AVFilterLink *outlink) static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) { - AVFilterLink *outlink = inlink->dst->outputs[0]; + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + ThreadData td; AVFrame *outpicref = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!outpicref) { av_frame_free(&inpicref); @@ -315,9 +330,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) outpicref->width = outlink->w; outpicref->height = outlink->h; - super2xsai(inlink->dst, inpicref->data[0], inpicref->linesize[0], - outpicref->data[0], outpicref->linesize[0], - inlink->w, inlink->h); + td.in = inpicref; td.out = outpicref; + ctx->internal->execute(ctx, super2xsai, &td, NULL, FFMIN(inlink->h, ctx->graph->nb_threads)); av_frame_free(&inpicref); return ff_filter_frame(outlink, outpicref); @@ -349,4 +363,5 @@ AVFilter avfilter_vf_super2xsai = { .query_formats = query_formats, .inputs = super2xsai_inputs, .outputs = super2xsai_outputs, + .flags = AVFILTER_FLAG_SLICE_THREADS, }; -- 1.7.11.2

3 2

[PATCH] Update my email address.
by Thilo Borgmann 13 Aug '13

13 Aug '13

I changed my email address in order to significantly decrease the power of google. -Thilo The following changes since commit 8e0b6d82b3dd515ac8b371c2eec549036b9d0bae: riff: add msn audio comment (2013-08-13 09:41:28 -0400) are available in the git repository at: git@github.com:thiloborgmann/FFmpeg.git update_email for you to fetch changes up to 6a64b23d93d05b765fbeff51b75d0c75e940bf9a: Update my email address. (2013-08-13 15:45:08 +0200) ---------------------------------------------------------------- Thilo Borgmann (1): Update my email address. libavcodec/alsdec.c | 4 ++-- libavcodec/bgmc.c | 4 ++-- libavcodec/bgmc.h | 4 ++-- libavcodec/exif.c | 4 ++-- libavcodec/exif.h | 4 ++-- libavcodec/tiff_common.c | 4 ++-- libavcodec/tiff_common.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 53856a1..19f3486 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1,6 +1,6 @@ /* * MPEG-4 ALS decoder - * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * MPEG-4 ALS decoder - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #include "avcodec.h" diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index 40e7d15..1a6817b 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -1,6 +1,6 @@ /* * Block Gilbert-Moore decoder - * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * Block Gilbert-Moore decoder as used by MPEG-4 ALS - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #include "libavutil/attributes.h" diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h index 9e386fd..4893736 100644 --- a/libavcodec/bgmc.h +++ b/libavcodec/bgmc.h @@ -1,6 +1,6 @@ /* * Block Gilbert-Moore decoder - * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * Block Gilbert-Moore decoder header - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 90a0586..ec524a5 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -1,6 +1,6 @@ /* * EXIF metadata parser - * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * EXIF metadata parser - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #include "exif.h" diff --git a/libavcodec/exif.h b/libavcodec/exif.h index 307c1fe..71fe829 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -1,6 +1,6 @@ /* * EXIF metadata parser - * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * EXIF metadata parser - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #ifndef AVCODEC_EXIF_H diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c index 0995dae..b7bd587 100644 --- a/libavcodec/tiff_common.c +++ b/libavcodec/tiff_common.c @@ -1,6 +1,6 @@ /* * TIFF Common Routines - * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * TIFF Common Routines - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #include "tiff_common.h" diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h index 15eeb76..2e08caf 100644 --- a/libavcodec/tiff_common.h +++ b/libavcodec/tiff_common.h @@ -1,6 +1,6 @@ /* * TIFF Common Routines - * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de> * * This file is part of FFmpeg. * @@ -22,7 +22,7 @@ /** * @file * TIFF Common Routines - * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> */ #ifndef AVCODEC_TIFF_COMMON_H

2 1

[PATCH] man page grammar fixes
by Bryce Harrington 13 Aug '13

13 Aug '13

From: Bryce Harrington <b.harrington(a)samsung.com> The first sentence of each of these man pages are worded a bit awkwardly. I think these minor copy-edits should make them clearer. Signed-off-by: Bryce Harrington <b.harrington(a)samsung.com> --- doc/demuxers.texi | 4 ++-- doc/ffmpeg.texi | 2 +- doc/outdevs.texi | 4 ++-- doc/protocols.texi | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e18448f..33a6cac 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -1,8 +1,8 @@ @chapter Demuxers @c man begin DEMUXERS -Demuxers are configured elements in FFmpeg which allow to read the -multimedia streams from a particular type of file. +Demuxers can read the multimedia streams from a particular type of +file. When you configure your FFmpeg build, all the supported demuxers are enabled by default. You can list all available ones using the diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index a923f97..8bf5feb 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1137,7 +1137,7 @@ then it will search for the file @file{libvpx-1080p.ffpreset}. @itemize @item -For streaming at very low bitrate application, use a low frame rate +For streaming at very low bitrates, use a low frame rate and a small GOP size. This is especially true for RealVideo where the Linux player does not seem to be very fast, so it can miss frames. An example is: diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 796797b..2c977b2 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -1,8 +1,8 @@ @chapter Output Devices @c man begin OUTPUT DEVICES -Output devices are configured elements in FFmpeg which allow to write -multimedia data to an output device attached to your system. +Output devices write multimedia data to an output device attached to +your system. When you configure your FFmpeg build, all the supported output devices are enabled by default. You can list all available ones using the diff --git a/doc/protocols.texi b/doc/protocols.texi index 9c834f4..9a3c4fe 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1,8 +1,7 @@ @chapter Protocols @c man begin PROTOCOLS -Protocols are configured elements in FFmpeg which allow to access -resources which require the use of a particular protocol. +Protocols enable access to resources that require specific protocols. When you configure your FFmpeg build, all the supported protocols are enabled by default. You can list all available ones using the -- 1.7.9.5

2 1

[PATCH] MAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for new fixed point FFT
by Nedeljko Babic 13 Aug '13

13 Aug '13

Signed-off-by: Nedeljko Babic <nedeljko.babic(a)imgtec.com> --- MAINTAINERS | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b295a93..8b00d1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -120,6 +120,8 @@ Generic Parts: libpostproc/* Michael Niedermayer table generation: tableprint.c, tableprint.h Reimar Doeffinger + fixed point FFT: + fft* Zeljko Lukac Codecs: 4xm.c Michael Niedermayer @@ -453,7 +455,7 @@ Operating systems / CPU architectures Alpha Mans Rullgard, Falk Hueffner ARM Mans Rullgard AVR32 Mans Rullgard -MIPS Mans Rullgard +MIPS Mans Rullgard, Nedeljko Babic Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier Amiga / PowerPC Colin Ward Linux / PowerPC Luca Barbato -- 1.7.3.4

2 1

[PATCH] Avoid reading beyond end of stream in resync function.
by Reimar Döffinger 13 Aug '13

13 Aug '13

This ends up printing a nonsense warning about "marker does not match f_code". This happens particularly frequently with VDPAU hwaccel since there we fast-forward the stream directly to the end. (Note: possibly it is incorrect for us to skip all the way to the end for VDPAU, possibly someone should investigate that, I am a bit lost in that regard). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libavcodec/ituh263dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 6d06a09..a88ff34 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -234,6 +234,8 @@ int ff_h263_resync(MpegEncContext *s){ skip_bits1(&s->gb); align_get_bits(&s->gb); } + if (get_bits_left(&s->gb) < 16) + return -1; if(show_bits(&s->gb, 16)==0){ pos= get_bits_count(&s->gb); -- 1.8.4.rc2

2 4

[PATCH] man page grammar fixes
by Bryce W. Harrington 13 Aug '13

13 Aug '13

The first sentence of each of these man pages are worded a bit awkwardly. I think these minor copy-edits should make them clearer. Signed-off-by: Bryce Harrington <b.harrington(a)samsung.com> --- doc/demuxers.texi | 2 +- doc/ffmpeg.texi | 2 +- doc/outdevs.texi | 2 +- doc/protocols.texi | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e18448f..437d1ca 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -1,7 +1,7 @@ @chapter Demuxers @c man begin DEMUXERS -Demuxers are configured elements in FFmpeg which allow to read the +Demuxers are configured elements in FFmpeg that can read the multimedia streams from a particular type of file. When you configure your FFmpeg build, all the supported demuxers diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index a923f97..8bf5feb 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1137,7 +1137,7 @@ then it will search for the file @file{libvpx-1080p.ffpreset}. @itemize @item -For streaming at very low bitrate application, use a low frame rate +For streaming at very low bitrates, use a low frame rate and a small GOP size. This is especially true for RealVideo where the Linux player does not seem to be very fast, so it can miss frames. An example is: diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 796797b..730b47b 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -1,7 +1,7 @@ @chapter Output Devices @c man begin OUTPUT DEVICES -Output devices are configured elements in FFmpeg which allow to write +Output devices are configured elements in FFmpeg that can write multimedia data to an output device attached to your system. When you configure your FFmpeg build, all the supported output devices diff --git a/doc/protocols.texi b/doc/protocols.texi index 9c834f4..e273859 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1,8 +1,8 @@ @chapter Protocols @c man begin PROTOCOLS -Protocols are configured elements in FFmpeg which allow to access -resources which require the use of a particular protocol. +Protocols are configured elements in FFmpeg that enable access to +resources that require specific protocols. When you configure your FFmpeg build, all the supported protocols are enabled by default. You can list all available ones using the -- 1.7.9.5

3 3

[PATCH 1/2] libavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since libavformat 55)
by Alexis Ballier 13 Aug '13

13 Aug '13

--- libavformat/version.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/version.h b/libavformat/version.h index c2ca0ab..74eed65 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_OLD_AVIO -#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif #ifndef FF_API_PKT_DUMP #define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -- 1.8.3.2

3 4

ProRes 4444 with Alpha Channel
by Andy_Copeland＠scee.net 13 Aug '13

13 Aug '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi there, We are currently investigating an automated process of generating ProRes assets from PNG image sequences but need some help with getting the Alpha Channel working with ProRes 4444 on FFMPEG. We're running FFMPEG on Windows 7 x64 machines and we are sure that the Alpha Channel is preserved when the output PNG's are generated from our various different pieces of motion graphics software. The command we're using is as follows: ffmpeg -r 30 -i "c:\Users\<username>\Desktop\Cube Vibrate\results \Cube%04d.png" -vcodec prores_ks -profile:v 4444 -pix_fmt yuva444p10le - -alpha_bits 8 -acodec copy "c:\Users\<username>\Desktop\Cube Vibrate \results\cube_vibrate_10.mov" Any help that can be given on this will be SOOOOO appreciated as it's been stumping us for a day or so now! I'm pretty sure it's just me being stupid - - but want to know for sure! Thanks in advance!! ac Kind Regards, Andy Copeland Virtualisation Specialist | World Wide Studios Europe T. +44 (0)20 7859 0269 Sony Computer Entertainment Europe Limited. http://uk.playstation.com/ ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify postmaster(a)scee.net This footnote also confirms that this email message has been checked for all known viruses. Sony Computer Entertainment Europe Limited Registered Office: 10 Great Marlborough Street, London W1F 7LP, United Kingdom Registered in England: 3277793 ********************************************************************** -----BEGIN PGP SIGNATURE----- Version: PGP Universal 3.3.0 (Build 9269) Charset: us-ascii wsBVAwUBUgJn0ogtkn60BdOeAQj81gf+OX41tuxE3VuwjRPc6ycaxCRctaWX3Qcz hE9RYJYF3UtSTqwhMnUhHvmLBJVRYZSKVrPsK0h3spxakh/npZrMXRNJrp32DILC FSyOsk5ByxH3sjmDcHo8jHa8SFlIOkWVFLUk/iRS1hBmYK/A6jzlOtjFF1dXQyyT UrAspfkAgyzQmkUGBGbZF7N5km1UF5QH6T8SjzOz0mpfKqIpcC7th60T/Bpqqtps dgX70Fvnh+oOQmp5fqb1TeneZj+gXLGHjETG+E3nOKNNZOhDUOPD2sa1xZg2rWZb rVeNtqgzHLzEL6Sx0xPj4htLk4QSxBinU/pMQmG2+cv1c9trV7L0Bg== =B/jk -----END PGP SIGNATURE-----

3 3

[PATCH] lavc: read EXIF metadata
by Thilo Borgmann 12 Aug '13

12 Aug '13

Hi, tested this with several (smart)phones and a digicams producing different tags and types to read. Never faced any of the unhandled data types though, so more samples would be needed to implement. Unknown or vendor specific tags are named by their tag id the vendor gives them. -Thilo

4 81

[PATCH] pixfmt: extend description for planar YUV 9/10 bits formats
by Kirill Gavrilov 12 Aug '13

12 Aug '13

It is unclean from documentation that fat planar 9/10 YUV formats (I suppose that 12/14 formats too) are actually stored in 16 bits samples with extra padding. Internally I use extended analog of AVColorRange enumeration extended with more ranges for 9/10 bits formats... ----------------------------------------------- Kirill Gavrilov, Software designer. <kirill(a)sview.ru>

2 1

[PATCH] img2dec: fix typo (double "with with")
by Kirill Gavrilov 12 Aug '13

12 Aug '13

Just noticed strange message and have decided to make a patch... > [image2 @ 0083E0A0] Could find no file *with with* path 'w:\cursor.std' > and index in the range 0-4 > ----------------------------------------------- Kirill Gavrilov, Software designer. <kirill(a)sview.ru>

2 1

[WIP][RFC][PATCH] png: support for skiping decoding data
by Paul B Mahol 12 Aug '13

12 Aug '13

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- Crude attempt at parsing only frame and not doing decoding. It returns frames with data, not calling ff_get_video_buffer() gives error. Perhaps doing this from parser is better solution. --- libavcodec/pngdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 1358ac5..067948c 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -65,6 +65,7 @@ typedef struct PNGDecContext { int pass_row_size; /* decompress row size of the current pass */ int y; z_stream zstream; + int decode_data; } PNGDecContext; /* Mask to determine which pixels are valid in a pass */ @@ -364,6 +365,11 @@ static int png_decode_idat(PNGDecContext *s, int length) s->zstream.next_in = (unsigned char *)s->gb.buffer; bytestream2_skip(&s->gb, length); + if (!s->decode_data) { + s->state |= PNG_ALLIMAGE; + return 0; + } + /* decode one line if possible */ while (s->zstream.avail_in > 0) { ret = inflate(&s->zstream, Z_PARTIAL_FLUSH); @@ -512,6 +518,8 @@ static int decode_frame(AVCodecContext *avctx, int64_t sig; int ret; + + s->decode_data = !(avctx->skip_frame == AVDISCARD_ALL); bytestream2_init(&s->gb, buf, buf_size); /* check signature */ @@ -641,6 +649,7 @@ static int decode_frame(AVCodecContext *avctx, p->key_frame = 1; p->interlaced_frame = !!s->interlace_type; + if (s->decode_data) { /* compute the compressed row size */ if (!s->interlace_type) { s->crow_size = s->row_size + 1; @@ -677,6 +686,7 @@ static int decode_frame(AVCodecContext *avctx, s->crow_buf = crow_buf_base + 15; s->zstream.avail_out = s->crow_size; s->zstream.next_out = s->crow_buf; + } } s->state |= PNG_IDAT; if (png_decode_idat(s, length) < 0) @@ -737,6 +747,8 @@ static int decode_frame(AVCodecContext *avctx, goto fail; } bytestream2_skip(&s->gb, 4); /* crc */ + if (!s->decode_data) + goto skip_decoding; goto exit_loop; default: /* skip tag */ @@ -840,6 +852,7 @@ static int decode_frame(AVCodecContext *avctx, } } +skip_decoding: av_frame_set_metadata(p, metadata); metadata = NULL; -- 1.7.11.2

3 5

[PATCH 1/2] lavfi/trim: check for right default value
by Paul B Mahol 12 Aug '13

12 Aug '13

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavfilter/trim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 9109e77..e9f2b20 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -94,7 +94,7 @@ static int config_input(AVFilterLink *inlink) s->start_time = s->start_time_dbl * 1e6; if (s->end_time_dbl != DBL_MAX) s->end_time = s->end_time_dbl * 1e6; - if (s->duration_dbl != DBL_MAX) + if (s->duration_dbl != 0) s->duration = s->duration_dbl * 1e6; if (s->start_time != INT64_MAX) { -- 1.7.11.2

2 3

[PATCH] ffmpeg: remove obsolete workaround in trim insertion.
by Nicolas George 12 Aug '13

12 Aug '13

The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- ffmpeg_filter.c | 4 ---- tests/ref/fate/adpcm-ima-amv | 2 +- tests/ref/fate/adpcm-ms-mono | 2 +- tests/ref/fate/bethsoft-vid | 2 +- tests/ref/fate/cyberia-c93 | 2 +- tests/ref/fate/msvideo1-8bit | 1 - tests/ref/lavf/aiff | 6 +++--- tests/ref/lavf/alaw | 6 +++--- tests/ref/lavf/asf | 4 ++-- tests/ref/lavf/ast | 6 +++--- tests/ref/lavf/au | 6 +++--- tests/ref/lavf/avi | 4 ++-- tests/ref/lavf/caf | 6 +++--- tests/ref/lavf/dv_fmt | 6 +++--- tests/ref/lavf/ffm | 4 ++-- tests/ref/lavf/gxf | 12 ++++++------ tests/ref/lavf/ircam | 6 +++--- tests/ref/lavf/mkv | 8 ++++---- tests/ref/lavf/mmf | 4 ++-- tests/ref/lavf/mov | 24 +++++++++++------------ tests/ref/lavf/mpg | 12 ++++++------ tests/ref/lavf/mulaw | 6 +++--- tests/ref/lavf/mxf | 4 ++-- tests/ref/lavf/nut | 4 ++-- tests/ref/lavf/ogg | 6 +++--- tests/ref/lavf/rm | 2 +- tests/ref/lavf/rso | 6 +++--- tests/ref/lavf/smjpeg | 6 +++--- tests/ref/lavf/sox | 6 +++--- tests/ref/lavf/ts | 4 ++-- tests/ref/lavf/voc | 6 +++--- tests/ref/lavf/voc_s16 | 6 +++--- tests/ref/lavf/w64 | 6 +++--- tests/ref/lavf/wav | 6 +++--- tests/ref/lavf/wtv | 4 ++-- tests/ref/seek/lavf-alaw | 2 +- tests/ref/seek/lavf-mov | 44 +++++++++++++++++++++--------------------- tests/ref/seek/lavf-mulaw | 2 +- 38 files changed, 121 insertions(+), 126 deletions(-) diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index c8164ed..e17c4a5 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -290,10 +290,6 @@ static int insert_trim(int64_t start_time, int64_t duration, if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE) return 0; - // Use with duration and without output starttime is buggy with trim filters - if (start_time == AV_NOPTS_VALUE) - return 0; - trim = avfilter_get_by_name(name); if (!trim) { av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit " diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv index ca7a168..4bd22af 100644 --- a/tests/ref/fate/adpcm-ima-amv +++ b/tests/ref/fate/adpcm-ima-amv @@ -158,4 +158,4 @@ 0, 215010, 215010, 1380, 2760, 0xb83548f4 0, 216390, 216390, 1378, 2756, 0x22647962 0, 217768, 217768, 1378, 2756, 0x14ca54d3 -0, 219146, 219146, 1378, 2756, 0x58754b3a +0, 219146, 219146, 1354, 2708, 0x85e82e8d diff --git a/tests/ref/fate/adpcm-ms-mono b/tests/ref/fate/adpcm-ms-mono index 3bf44f8..c456708 100644 --- a/tests/ref/fate/adpcm-ms-mono +++ b/tests/ref/fate/adpcm-ms-mono @@ -43,4 +43,4 @@ 0, 20500, 20500, 500, 1000, 0xf195eb44 0, 21000, 21000, 500, 1000, 0xa491f3ef 0, 21500, 21500, 500, 1000, 0x2c036e18 -0, 22000, 22000, 500, 1000, 0x52d65e2a +0, 22000, 22000, 50, 100, 0x0bd81f05 diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid index f59823c..9f96da1 100644 --- a/tests/ref/fate/bethsoft-vid +++ b/tests/ref/fate/bethsoft-vid @@ -140,4 +140,4 @@ 0, 68, 68, 1, 192000, 0x3ec3cce1 1, 54760, 54760, 537, 1074, 0x142ce7ba 0, 69, 69, 1, 192000, 0x159313a8 -1, 55297, 55297, 925, 1850, 0x7ff682f7 +1, 55297, 55297, 258, 516, 0x98885b26 diff --git a/tests/ref/fate/cyberia-c93 b/tests/ref/fate/cyberia-c93 index 2c71e50..f02435c 100644 --- a/tests/ref/fate/cyberia-c93 +++ b/tests/ref/fate/cyberia-c93 @@ -36,7 +36,7 @@ 0, 30, 30, 1, 184320, 0x54975910 0, 31, 31, 1, 184320, 0xf4857db9 0, 32, 32, 1, 184320, 0x82d18161 -1, 42552, 42552, 14184, 28368, 0x9101e519 +1, 42552, 42552, 5835, 11670, 0x04aa0b1e 0, 33, 33, 1, 184320, 0x06d93bd0 0, 34, 34, 1, 184320, 0xa4304c00 0, 35, 35, 1, 184320, 0x5f77d9cd diff --git a/tests/ref/fate/msvideo1-8bit b/tests/ref/fate/msvideo1-8bit index 6e6bc0b..74d54e8 100644 --- a/tests/ref/fate/msvideo1-8bit +++ b/tests/ref/fate/msvideo1-8bit @@ -29,4 +29,3 @@ 0, 27, 27, 1, 57600, 0x4ec4a868 0, 28, 28, 1, 57600, 0x7db370a1 0, 29, 29, 1, 57600, 0x2b1e52f6 -0, 30, 30, 1, 57600, 0x2141467c diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff index 2a5cd81..c504c18 100644 --- a/tests/ref/lavf/aiff +++ b/tests/ref/lavf/aiff @@ -1,3 +1,3 @@ -b0d42747a6fc99a5cd1ab0e861671f3a *./tests/data/lavf/lavf.aif -90182 ./tests/data/lavf/lavf.aif -./tests/data/lavf/lavf.aif CRC=0xf1ae5536 +2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif +88270 ./tests/data/lavf/lavf.aif +./tests/data/lavf/lavf.aif CRC=0x3a1da17e diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/alaw index 65bcf99..d93d6fc 100644 --- a/tests/ref/lavf/alaw +++ b/tests/ref/lavf/alaw @@ -1,3 +1,3 @@ -8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/lavf/lavf.al -45056 ./tests/data/lavf/lavf.al -./tests/data/lavf/lavf.al CRC=0x5e6d372b +652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al +44100 ./tests/data/lavf/lavf.al +./tests/data/lavf/lavf.al CRC=0xf9643112 diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf index cfa53dc..a90e547 100644 --- a/tests/ref/lavf/asf +++ b/tests/ref/lavf/asf @@ -1,3 +1,3 @@ -3937dfece4b48c0cdd8f44bcab3cdd2d *./tests/data/lavf/lavf.asf +6bc7dc5698c3607fad8937d14560e50c *./tests/data/lavf/lavf.asf 333581 ./tests/data/lavf/lavf.asf -./tests/data/lavf/lavf.asf CRC=0x51485213 +./tests/data/lavf/lavf.asf CRC=0xf6340a10 diff --git a/tests/ref/lavf/ast b/tests/ref/lavf/ast index 72a9824..513c612 100644 --- a/tests/ref/lavf/ast +++ b/tests/ref/lavf/ast @@ -1,3 +1,3 @@ -7fa8cd2dd7453428e71930a7c65f7b62 *./tests/data/lavf/lavf.ast -181696 ./tests/data/lavf/lavf.ast -./tests/data/lavf/lavf.ast CRC=0x7bd585ff +07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast +177872 ./tests/data/lavf/lavf.ast +./tests/data/lavf/lavf.ast CRC=0xe61e3bd0 diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au index b9b70a1..ede4926 100644 --- a/tests/ref/lavf/au +++ b/tests/ref/lavf/au @@ -1,3 +1,3 @@ -dc54f834a23ddc0c086a86f0cef898d7 *./tests/data/lavf/lavf.au -90144 ./tests/data/lavf/lavf.au -./tests/data/lavf/lavf.au CRC=0xf1ae5536 +aa5ec1f82ac07c653ffc527b0f0dc10d *./tests/data/lavf/lavf.au +88232 ./tests/data/lavf/lavf.au +./tests/data/lavf/lavf.au CRC=0x3a1da17e diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi index 056d0c7..3cbb44f 100644 --- a/tests/ref/lavf/avi +++ b/tests/ref/lavf/avi @@ -1,3 +1,3 @@ -feb26a85f820ede7e521a55be565f3b1 *./tests/data/lavf/lavf.avi +8d3a3554cbe21bc232603ca26b0c4d3e *./tests/data/lavf/lavf.avi 330806 ./tests/data/lavf/lavf.avi -./tests/data/lavf/lavf.avi CRC=0x4780846b +./tests/data/lavf/lavf.avi CRC=0xec6c3c68 diff --git a/tests/ref/lavf/caf b/tests/ref/lavf/caf index f2ae9c3..7b2a67d 100644 --- a/tests/ref/lavf/caf +++ b/tests/ref/lavf/caf @@ -1,3 +1,3 @@ -6c97bfc8e455d5fb8b3b45806857a953 *./tests/data/lavf/lavf.caf -90235 ./tests/data/lavf/lavf.caf -./tests/data/lavf/lavf.caf CRC=0xf1ae5536 +c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf +88323 ./tests/data/lavf/lavf.caf +./tests/data/lavf/lavf.caf CRC=0x3a1da17e diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index ed8c5cc..3c8e5b1 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -1,9 +1,9 @@ 11be3e5caa2892236b3475c3f7807b76 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x25bdd732 -78db8504eefb660ed205b417157d4f44 *./tests/data/lavf/lavf.dv -3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x1cec8738 +e9949bc767924e1e7d28856029fee024 *./tests/data/lavf/lavf.dv +3480000 ./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0xc4f27ca7 87d3b20f656235671383a7eaa2f66330 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x0e868a82 diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index 6f67365..7071866 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -d33fae310a7f6db1dc7fb74d1a9e0e6a *./tests/data/lavf/lavf.ffm +6f1443b952819cff1dae875529675e88 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm -./tests/data/lavf/lavf.ffm CRC=0x5b136bb1 +./tests/data/lavf/lavf.ffm CRC=0x000e23ae diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index bdcbd1c..14a2c87 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,9 +1,9 @@ -a9672bb2a5b7927bf362f76bcce9bdf7 *./tests/data/lavf/lavf.gxf +9c96119322262ed2c43b34fd415233cc *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x147ff044 -2138952377f92d9c3a036f576197dbd7 *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0xda7cebbc +260acc1c88a1706e5aaa74eff99ac389 *./tests/data/lavf/lavf.gxf 794656 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xe0199511 -f89a6b3e8a2c88eacafef7e283e6418b *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0x7f0c9089 +3cb8bab80b73a95f51e50989ccf06817 *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xd9d58865 +./tests/data/lavf/lavf.gxf CRC=0x5ade0285 diff --git a/tests/ref/lavf/ircam b/tests/ref/lavf/ircam index e29a7ad..47e0709 100644 --- a/tests/ref/lavf/ircam +++ b/tests/ref/lavf/ircam @@ -1,3 +1,3 @@ -2cfae025de1b13098ef84a5e7f9947aa *./tests/data/lavf/lavf.ircam -91136 ./tests/data/lavf/lavf.ircam -./tests/data/lavf/lavf.ircam CRC=0xf1ae5536 +45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam +89224 ./tests/data/lavf/lavf.ircam +./tests/data/lavf/lavf.ircam CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 20e8e1c..4bb97fd 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -b9557a7fa418db7692587b45d20f0d76 *./tests/data/lavf/lavf.mkv +6273e6c20231e89e167f99706388b1b5 *./tests/data/lavf/lavf.mkv 472542 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b -fd214bc74f0a21dfb36dcf9bb5777b86 *./tests/data/lavf/lavf.mkv +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 +36633da729b88a171a0dfc969db23bcc *./tests/data/lavf/lavf.mkv 320274 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf index fea8015..fae95ca 100644 --- a/tests/ref/lavf/mmf +++ b/tests/ref/lavf/mmf @@ -1,3 +1,3 @@ -b165af6f2e5c6c1de733e9d3848bcebb *./tests/data/lavf/lavf.mmf +643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf 22611 ./tests/data/lavf/lavf.mmf -./tests/data/lavf/lavf.mmf CRC=0x03633476 +./tests/data/lavf/lavf.mmf CRC=0x8dea1388 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 2ed8ad0..3b484ec 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov -367365 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -72eac0051107a16e41d5263dab640f26 *./tests/data/lavf/lavf.mov -358455 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -cf6ea2e8d4d16626d9dbd9e3fb802ce6 *./tests/data/lavf/lavf.mov -367549 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0x6e82384a -7c932d24837f46ef57d3e40a61331565 *./tests/data/lavf/lavf.mov -357837 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 +673de726034d2a44be176fa8166df376 *./tests/data/lavf/lavf.mov +366421 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +e833d2e258ee20ef7c13470be8ea293b *./tests/data/lavf/lavf.mov +357511 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +75fd61635a9707a8bed9a32958fe3275 *./tests/data/lavf/lavf.mov +366593 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xa9793231 +9bcbda2320a1434a3b9470389b45564e *./tests/data/lavf/lavf.mov +356893 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index 798ee03..9feff66 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,9 +1,9 @@ -ddc5cd5469eb8a0500f8a725baead5e5 *./tests/data/lavf/lavf.mpg +0a8c879bf813b6b758806088f29842dc *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 -7962eab004026dd7a8c0417470cdf574 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x000e23ae +d9446ae7b49de006a5a0f052ea9333ca *./tests/data/lavf/lavf.mpg 389120 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0xbbbf92bc -bb22933de60193bce9032f67ce6fcc23 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9 +edfef790122870cf4652e8a92ca558a0 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 +./tests/data/lavf/lavf.mpg CRC=0x000e23ae diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/mulaw index c6fa058..bd54084 100644 --- a/tests/ref/lavf/mulaw +++ b/tests/ref/lavf/mulaw @@ -1,3 +1,3 @@ -e64027a96ad5907ee281deff3286da0a *./tests/data/lavf/lavf.ul -45056 ./tests/data/lavf/lavf.ul -./tests/data/lavf/lavf.ul CRC=0xe028b50a +ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul +44100 ./tests/data/lavf/lavf.ul +./tests/data/lavf/lavf.ul CRC=0x4515fa26 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index b1e46e9..b1918f5 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ 967f6ee9223c865328f4891465191108 *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 -7788939d349d09a7f9b546e59376a496 *./tests/data/lavf/lavf.mxf +a085845074129d732fc6adb5601e3b5e *./tests/data/lavf/lavf.mxf 560697 ./tests/data/lavf/lavf.mxf -./tests/data/lavf/lavf.mxf CRC=0xb69f428b +./tests/data/lavf/lavf.mxf CRC=0x3ff4178e ce535b606423d117675213b16275206a *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut index 72e59e8..6c42a40 100644 --- a/tests/ref/lavf/nut +++ b/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -56c403dd91ae1dd4569348381b2b43a4 *./tests/data/lavf/lavf.nut +66386a488ee35e4592b605f63ef90a73 *./tests/data/lavf/lavf.nut 319902 ./tests/data/lavf/lavf.nut -./tests/data/lavf/lavf.nut CRC=0x4780846b +./tests/data/lavf/lavf.nut CRC=0xec6c3c68 diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg index 584e09b..f8b58c4 100644 --- a/tests/ref/lavf/ogg +++ b/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -ce1734741fa50c6c85f9cc8f410a720c *./tests/data/lavf/lavf.ogg -13985 ./tests/data/lavf/lavf.ogg -./tests/data/lavf/lavf.ogg CRC=0x37a143ea +304a201b4afa3583b206bdeef177ce6b *./tests/data/lavf/lavf.ogg +13495 ./tests/data/lavf/lavf.ogg +./tests/data/lavf/lavf.ogg CRC=0x3a1da17e diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index d396e00..62e0a31 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -a3a875be9c528a2a4534a5a31230fdae *./tests/data/lavf/lavf.rm +e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm 346424 ./tests/data/lavf/lavf.rm diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso index 648c248..5878f43 100644 --- a/tests/ref/lavf/rso +++ b/tests/ref/lavf/rso @@ -1,3 +1,3 @@ -f41fd78f7df981802e7caeb23648b8c0 *./tests/data/lavf/lavf.rso -45064 ./tests/data/lavf/lavf.rso -./tests/data/lavf/lavf.rso CRC=0x74b2b546 +443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso +44108 ./tests/data/lavf/lavf.rso +./tests/data/lavf/lavf.rso CRC=0x298fd284 diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg index 3e7e8ed..a2eeb97 100644 --- a/tests/ref/lavf/smjpeg +++ b/tests/ref/lavf/smjpeg @@ -1,3 +1,3 @@ -2f6e613e9e257545e1048d57de92ba92 *./tests/data/lavf/lavf.smjpeg -791463 ./tests/data/lavf/lavf.smjpeg -./tests/data/lavf/lavf.smjpeg CRC=0x557714ff +a95982a2d390f4dcdc72a41d8920abb9 *./tests/data/lavf/lavf.smjpeg +789551 ./tests/data/lavf/lavf.smjpeg +./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147 diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox index 0026480..fc368b1 100644 --- a/tests/ref/lavf/sox +++ b/tests/ref/lavf/sox @@ -1,3 +1,3 @@ -e6f278256f145b69ed06f35b8d3585c1 *./tests/data/lavf/lavf.sox -180256 ./tests/data/lavf/lavf.sox -./tests/data/lavf/lavf.sox CRC=0xf1ae5536 +683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox +176432 ./tests/data/lavf/lavf.sox +./tests/data/lavf/lavf.sox CRC=0x3a1da17e diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index d795c27..02921ed 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -04ba219e6f56f7b0fa4a47765323d204 *./tests/data/lavf/lavf.ts +a876e6bde8a2e8c7eca878869433ad3b *./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts -./tests/data/lavf/lavf.ts CRC=0xcc2dc628 +./tests/data/lavf/lavf.ts CRC=0x71287e25 diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc index 062da63..ded8af7 100644 --- a/tests/ref/lavf/voc +++ b/tests/ref/lavf/voc @@ -1,3 +1,3 @@ -e4cefbeb4c20f5735de1877fbcfd8d1d *./tests/data/lavf/lavf.voc -45261 ./tests/data/lavf/lavf.voc -./tests/data/lavf/lavf.voc CRC=0x74b2b546 +bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc +44305 ./tests/data/lavf/lavf.voc +./tests/data/lavf/lavf.voc CRC=0x298fd284 diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16 index 23e5aab..d026090 100644 --- a/tests/ref/lavf/voc_s16 +++ b/tests/ref/lavf/voc_s16 @@ -1,3 +1,3 @@ -a8225786fdbf5a2a19d1eeaf15f28632 *./tests/data/lavf/lavf.s16.voc -180439 ./tests/data/lavf/lavf.s16.voc -./tests/data/lavf/lavf.s16.voc CRC=0x7bd585ff +db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc +176615 ./tests/data/lavf/lavf.s16.voc +./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0 diff --git a/tests/ref/lavf/w64 b/tests/ref/lavf/w64 index 9acda83..7da4f09 100644 --- a/tests/ref/lavf/w64 +++ b/tests/ref/lavf/w64 @@ -1,3 +1,3 @@ -420bf38762386ae2ba8bf2e85b6cc7f2 *./tests/data/lavf/lavf.w64 -90224 ./tests/data/lavf/lavf.w64 -./tests/data/lavf/lavf.w64 CRC=0xf1ae5536 +062b91c34d570a90af8d55427804878e *./tests/data/lavf/lavf.w64 +88312 ./tests/data/lavf/lavf.w64 +./tests/data/lavf/lavf.w64 CRC=0x3a1da17e diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav index cc8ec1d..600c26a 100644 --- a/tests/ref/lavf/wav +++ b/tests/ref/lavf/wav @@ -1,3 +1,3 @@ -c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav -90188 ./tests/data/lavf/lavf.wav -./tests/data/lavf/lavf.wav CRC=0xf1ae5536 +eb5a869456d2e9107bb195c8c99be1a1 *./tests/data/lavf/lavf.wav +88276 ./tests/data/lavf/lavf.wav +./tests/data/lavf/lavf.wav CRC=0x3a1da17e diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index f54f862..fe1b83c 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -237211f6aa3df9da2dfe0f7d5b8ba85c *./tests/data/lavf/lavf.wtv +98dd5205889313542da71351fbaf4172 *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv -./tests/data/lavf/lavf.wtv CRC=0xcc2dc628 +./tests/data/lavf/lavf.wtv CRC=0x71287e25 diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-alaw index 84661ec..4b1f8fb 100644 --- a/tests/ref/seek/lavf-alaw +++ b/tests/ref/seek/lavf-alaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 diff --git a/tests/ref/seek/lavf-mov b/tests/ref/seek/lavf-mov index 9563a0d..93a9a23 100644 --- a/tests/ref/seek/lavf-mov +++ b/tests/ref/seek/lavf-mov @@ -1,48 +1,48 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.788359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.576667 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153359 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164185 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164197 size: 1024 ret: 0 st: 0 flags:0 ts:-0.481641 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret:-1 st: 1 flags:0 ts: 1.306667 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.883359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.671678 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-mulaw index 84661ec..4b1f8fb 100644 --- a/tests/ref/seek/lavf-mulaw +++ b/tests/ref/seek/lavf-mulaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 -- 1.7.10.4

4 16

[PATCH] Fix wrong use of "an" in some comments.
by Thilo Borgmann 12 Aug '13

12 Aug '13

Hi, this patch fixes several wrong uses of "an" in the comments/doxy. It is to be used if the following _spoken_ pronunciation is a vocal (can't find better words). This time, my first try for a pull-request. If I haven't missed it, we are lacking some documentation for how to send pull-request-based contributions on the web page. -Thilo

2 1

[PATCH] ape: check return value
by wm4 11 Aug '13

11 Aug '13

This set pkt->size to absurd values when playing incomplete APE files. --- libavformat/ape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/ape.c b/libavformat/ape.c index e2b8ada..bb61a24 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -414,6 +414,8 @@ static int ape_read_packet(AVFormatContext * s, AVPacket * pkt) AV_WL32(pkt->data , nblocks); AV_WL32(pkt->data + 4, ape->frames[ape->currentframe].skip); ret = avio_read(s->pb, pkt->data + extra_size, ape->frames[ape->currentframe].size); + if (ret < 0) + return ret; pkt->pts = ape->frames[ape->currentframe].pts; pkt->stream_index = 0; -- 1.8.4.rc1

2 2