January 2015 - ffmpeg-cvslog - lists.ffmpeg.org

doc/indevs/libcdio: apply minor spell fixes, extend documentation
by git＠videolan.org 06 Feb '15

06 Feb '15

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Wed Jan 21 20:10:45 2015 +0100| [f422f474dfa7e9f54197dde961e4a01cd060994f] | committer: Stefano Sabatini doc/indevs/libcdio: apply minor spell fixes, extend documentation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f422f474dfa7e9f54… --- doc/indevs.texi | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index bd09f3f..f4a5779 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -627,20 +627,47 @@ ffmpeg -f lavfi -i "movie=test.ts[out0+subcc]" -map v frame%08d.png -map s -c co @section libcdio -Audio-CD input device based on cdio. +Audio-CD input device based on libcdio. To enable this input device during configuration you need libcdio -installed on your system. Requires the configure option +installed on your system. It requires the configure option @code{--enable-libcdio}. This device allows playing and grabbing from an Audio-CD. -For example to copy with @command{ffmpeg} the entire Audio-CD in /dev/sr0, +For example to copy with @command{ffmpeg} the entire Audio-CD in @file{/dev/sr0}, you may run the command: @example ffmpeg -f libcdio -i /dev/sr0 cd.wav @end example +@subsection Options +@table @option +@item speed +Set drive reading speed. Default value is 0. + +The speed is specified CD-ROM speed units. The speed is set through +the libcdio @code{cdio_cddap_speed_set} function. On many CD-ROM +drives, specifying a value too large will result in using the fastest +speed. + +@item paranoia_mode +Set paranoia recovery mode flags. It accepts one of the following values: + +@table @samp +@item disable +@item verify +@item overlap +@item neverskip +@item full +@end table + +Default value is @samp{disable}. + +For more information about the available recovery modes, consult the +paranoia project documentation. +@end table + @section libdc1394 IIDC1394 input device, based on libdc1394 and libraw1394.

2 1

avcodec/h261enc: Avoid casts, Simplify code
by git＠videolan.org 01 Feb '15

01 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 19:49:28 2015 +0100| [b9c3f041e029ccb5c0462fb46eb8b95f69cd9a9c] | committer: Michael Niedermayer avcodec/h261enc: Avoid casts, Simplify code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9c3f041e029ccb5c… --- libavcodec/h261enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index d7b56a8..87eb94f 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -61,8 +61,8 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 20, 0x10); /* PSC */ - temp_ref = s->picture_number * (int64_t)30000 * s->avctx->time_base.num / - (1001 * (int64_t)s->avctx->time_base.den); // FIXME maybe this should use a timestamp + temp_ref = s->picture_number * 30000L * s->avctx->time_base.num / + (1001L * s->avctx->time_base.den); // FIXME maybe this should use a timestamp put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */ put_bits(&s->pb, 1, 0); /* split screen off */

3 2

examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Sat Jan 31 21:11:38 2015 +0100| [2a3b7a55b51116c968fc32d4b6a2f7cc35e677f2] | committer: Michael Niedermayer examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a3b7a55b51116c96… --- doc/examples/demuxing_decoding.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c index 2ce4018..30bee1d 100644 --- a/doc/examples/demuxing_decoding.c +++ b/doc/examples/demuxing_decoding.c @@ -138,7 +138,7 @@ static int decode_packet(int *got_frame, int cached) static int open_codec_context(int *stream_idx, AVFormatContext *fmt_ctx, enum AVMediaType type) { - int ret; + int ret, stream_index; AVStream *st; AVCodecContext *dec_ctx = NULL; AVCodec *dec = NULL; @@ -150,8 +150,8 @@ static int open_codec_context(int *stream_idx, av_get_media_type_string(type), src_filename); return ret; } else { - *stream_idx = ret; - st = fmt_ctx->streams[*stream_idx]; + stream_index = ret; + st = fmt_ctx->streams[stream_index]; /* find decoder for the stream */ dec_ctx = st->codec; @@ -170,6 +170,7 @@ static int open_codec_context(int *stream_idx, av_get_media_type_string(type)); return ret; } + *stream_idx = stream_index; } return 0;

1 0

avcodec/motion_est: Set subcmp consistently for H261
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 21:14:08 2015 +0100| [b80106169ab16c31e27ea464ca62b805b205d61d] | committer: Michael Niedermayer avcodec/motion_est: Set subcmp consistently for H261 Fixes Ticket3150 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b80106169ab16c31e… --- libavcodec/motion_est.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 901fafd..749af72 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -321,6 +321,9 @@ int ff_init_me(MpegEncContext *s){ c->avctx= s->avctx; + if(s->codec_id == AV_CODEC_ID_H261) + c->avctx->me_sub_cmp = c->avctx->me_cmp; + if(cache_size < 2*dia_size && !c->stride){ av_log(s->avctx, AV_LOG_INFO, "ME_MAP size may be a little small for the selected diamond size\n"); }

1 0

avcodec/h261enc: More specific return code
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 19:49:57 2015 +0100| [3aefa1eb69c48563302d1f8869d424283b66031d] | committer: Michael Niedermayer avcodec/h261enc: More specific return code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3aefa1eb69c485633… --- libavcodec/h261enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 87eb94f..b888a36 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -46,7 +46,7 @@ int ff_h261_get_picture_format(int width, int height) return 1; // ERROR else - return -1; + return AVERROR(EINVAL); } void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number)

1 0

avformat/cache: pass options to the underlying protocol via the url_open2
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Zhang Rui <bbcallen(a)gmail.com> | Sat Jan 31 13:35:04 2015 +0800| [ca2e3e47fc6f755e5614e33dc0e654b8137fc16f] | committer: Michael Niedermayer avformat/cache: pass options to the underlying protocol via the url_open2 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca2e3e47fc6f755e5… --- libavformat/cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/cache.c b/libavformat/cache.c index 02b02bb..26e68c5 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -70,7 +70,7 @@ static int cmp(void *key, const void *node) return (*(int64_t *) key) - ((const CacheEntry *) node)->logical_pos; } -static int cache_open(URLContext *h, const char *arg, int flags) +static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary **options) { char *buffername; Context *c= h->priv_data; @@ -86,7 +86,7 @@ static int cache_open(URLContext *h, const char *arg, int flags) unlink(buffername); av_freep(&buffername); - return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, NULL); + return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, options); } static int add_entry(URLContext *h, const unsigned char *buf, int size) @@ -313,7 +313,7 @@ static const AVClass cache_context_class = { URLProtocol ff_cache_protocol = { .name = "cache", - .url_open = cache_open, + .url_open2 = cache_open, .url_read = cache_read, .url_seek = cache_seek, .url_close = cache_close,

1 0

Merge remote-tracking branch 'cehoyos/master'
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 14:29:11 2015 +0100| [958836f8c5197ee32133a0ca7d35bcbb50358379] | committer: Michael Niedermayer Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2. lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2. Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=958836f8c5197ee32… ---

1 0

lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Jan 31 10:05:24 2015 +0100| [f9f9ae1b77e4fb1bffa6b23be7bd20e514b8ba7b] | committer: Carl Eugen Hoyos lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9f9ae1b77e4fb1bf… --- libavcodec/arm/h264dsp_init_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 88dfd75..90144d0 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -76,8 +76,8 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth, if (bit_depth == 8) { c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon; - if(chroma_format_idc == 1){ c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon; + if(chroma_format_idc == 1){ c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; }

1 0

lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Jan 31 10:01:37 2015 +0100| [4faea46bd906b3897018736208123aa36c3f45d5] | committer: Carl Eugen Hoyos lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4faea46bd906b3897… --- libavcodec/aarch64/h264dsp_init_aarch64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aarch64/h264dsp_init_aarch64.c b/libavcodec/aarch64/h264dsp_init_aarch64.c index ed5e4bd..e0f378f 100644 --- a/libavcodec/aarch64/h264dsp_init_aarch64.c +++ b/libavcodec/aarch64/h264dsp_init_aarch64.c @@ -78,6 +78,7 @@ av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth, c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon; c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon; + if (chroma_format_idc <= 1) c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;

1 0

configure: remove mp_filter leftover
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 31 12:56:47 2015 +0000| [b47ab04c40ab771bc8e96a0756821515cc2fbac4] | committer: Paul B Mahol configure: remove mp_filter leftover Pointed out by: ubitux Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b47ab04c40ab771bc… --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 4e38073..6c61f2a 100755 --- a/configure +++ b/configure @@ -5423,7 +5423,6 @@ enabled ebur128_filter && enabled swresample && prepend avfilter_deps "swresampl enabled elbg_filter && prepend avfilter_deps "avcodec" enabled mcdeint_filter && prepend avfilter_deps "avcodec" enabled movie_filter && prepend avfilter_deps "avformat avcodec" -enabled mp_filter && prepend avfilter_deps "avcodec" enabled pan_filter && prepend avfilter_deps "swresample" enabled pp_filter && prepend avfilter_deps "postproc" enabled removelogo_filter && prepend avfilter_deps "avformat avcodec swscale"

1 0