[FFmpeg-cvslog] avformat/utils: av_probe_input_buffer2 decrease difference to libav
Michael Niedermayer
git at videolan.org
Tue Feb 4 05:34:55 CET 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 22:37:31 2014 +0100| [a5c3f596d1f7e092f928f48e8a21de5096d21e05] | 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>
(cherry picked from commit 05c78f345b623a3eed203ab17da6e1419d56abd0)
Conflicts:
libavformat/utils.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5c3f596d1f7e092f928f48e8a21de5096d21e05
---
libavformat/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8e5ec48..48882be 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -432,7 +432,7 @@ int av_probe_input_buffer(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;
More information about the ffmpeg-cvslog
mailing list