[FFmpeg-cvslog] avformat/utils: av_probe_input_buffer2 decrease difference to libav
Michael Niedermayer
git at videolan.org
Tue Jan 14 01:59:36 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 22:37:31 2014 +0100| [05c78f345b623a3eed203ab17da6e1419d56abd0] | committer: Michael Niedermayer
avformat/utils: av_probe_input_buffer2 decrease difference to libav
This removes the initialization of 2 unused fields
The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50
but wasnt merged as the fields could still be used
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05c78f345b623a3eed203ab17da6e1419d56abd0
---
libavformat/utils.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 29ec5b4..3f4446d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -342,7 +342,7 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
const char *filename, void *logctx,
unsigned int offset, unsigned int max_probe_size)
{
- AVProbeData pd = { filename ? filename : "", NULL, -offset };
+ AVProbeData pd = { filename ? filename : "" };
uint8_t *buf = NULL;
uint8_t *mime_type;
int ret = 0, probe_size, buf_offset = 0;
@@ -371,7 +371,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt;
probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
-
score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;
/* read probe data */
More information about the ffmpeg-cvslog
mailing list