ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jul 29 21:38:15 2014 +0200| [d38edeee9b70f8c15ba549a40f8c72595513516e] | committer: Michael Niedermayer
avformat/format: fix memleak and error code Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d38edeee9b70f8c15ba549a40f8c72595513516e --- libavformat/format.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/format.c b/libavformat/format.c index 5f1e83c..233fbd7 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -257,6 +257,7 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, uint8_t *mime_type; int ret = 0, probe_size, buf_offset = 0; int score = 0; + int ret2; if (!max_probe_size) max_probe_size = PROBE_BUF_MAX; @@ -331,8 +332,9 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, fail: /* Rewind. Reuse probe buffer to avoid seeking. */ + ret2 = ffio_rewind_with_probe_data(pb, &buf, buf_offset); if (ret >= 0) - ret = ffio_rewind_with_probe_data(pb, &buf, buf_offset); + ret = ret2; #if FF_API_PROBE_MIME av_free(pd.mime_type); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
