[FFmpeg-cvslog] avformat/utils/av_probe_input_buffer2: Fix pd.buf_size

Michael Niedermayer git at videolan.org
Tue Feb 4 05:34:54 CET 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 22:14:02 2014 +0100| [82b44665e98256cd335ac35b4b6f1d46d82126cf] | committer: Michael Niedermayer

avformat/utils/av_probe_input_buffer2: Fix pd.buf_size

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6a2064820b52568c05a9ec8f418f18840e7c43cc)

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

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

 libavformat/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9d1dad1..3a736d1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -482,7 +482,8 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
             score = 0;
             ret = 0;            /* error was end of file, nothing read */
         }
-        pd.buf_size = buf_offset += ret;
+        buf_offset += ret;
+        pd.buf_size = buf_offset - offset;
         pd.buf = &buf[offset];
 
         memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE);



More information about the ffmpeg-cvslog mailing list