[FFmpeg-cvslog] avformat/lavfi: force probesize to cover at least 30 frames

Michael Niedermayer git at videolan.org
Thu Feb 28 21:03:19 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 28 20:24:05 2013 +0100| [b56e029bdc9a68ed9decc7d3ad77e15aa5f4071d] | committer: Michael Niedermayer

avformat/lavfi: force probesize to cover at least 30 frames

This ensures that fps and other values are estimated correctly,
the probesize also is intended to limit disk/protocol reads which
does not apply to lavfi inputs at all.

Fixes Ticket1051

Something similar could be usefull to other input devices

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b56e029bdc9a68ed9decc7d3ad77e15aa5f4071d
---

 libavdevice/lavfi.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index e4cacb6..3b6f0c3 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -282,6 +282,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
             st->codec->height     = link->h;
             st       ->sample_aspect_ratio =
             st->codec->sample_aspect_ratio = link->sample_aspect_ratio;
+            avctx->probesize = FFMAX(avctx->probesize,
+                                     link->w * link->h *
+                                     av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(link->format)) *
+                                     30);
         } else if (link->type == AVMEDIA_TYPE_AUDIO) {
             st->codec->codec_id    = av_get_pcm_codec(link->format, -1);
             st->codec->channels    = av_get_channel_layout_nb_channels(link->channel_layout);



More information about the ffmpeg-cvslog mailing list