Commit d38edeee authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/format: fix memleak and error code

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4182728c
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment