Commit e74c01db authored by Anssi Hannula's avatar Anssi Hannula Committed by Michael Niedermayer

lavf: simplify pb parameter of ff_probe_input_buffer

There is no need to pass the ByteIOContext via a pointer to a pointer
anymore.
Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit aad216fd)
parent 2e47df70
...@@ -97,7 +97,7 @@ uint64_t ff_ntp_time(void); ...@@ -97,7 +97,7 @@ uint64_t ff_ntp_time(void);
* @return 0 in case of success, a negative value corresponding to an * @return 0 in case of success, a negative value corresponding to an
* AVERROR code otherwise * AVERROR code otherwise
*/ */
int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, int ff_probe_input_buffer(ByteIOContext *pb, AVInputFormat **fmt,
const char *filename, void *logctx, const char *filename, void *logctx,
unsigned int offset, unsigned int max_probe_size); unsigned int offset, unsigned int max_probe_size);
......
...@@ -524,7 +524,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, ...@@ -524,7 +524,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
#define PROBE_BUF_MIN 2048 #define PROBE_BUF_MIN 2048
#define PROBE_BUF_MAX (1<<20) #define PROBE_BUF_MAX (1<<20)
int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, int ff_probe_input_buffer(ByteIOContext *pb, AVInputFormat **fmt,
const char *filename, void *logctx, const char *filename, void *logctx,
unsigned int offset, unsigned int max_probe_size) unsigned int offset, unsigned int max_probe_size)
{ {
...@@ -555,7 +555,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, ...@@ -555,7 +555,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt,
/* read probe data */ /* read probe data */
buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE); buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
if ((ret = get_buffer(*pb, buf + buf_offset, probe_size - buf_offset)) < 0) { if ((ret = get_buffer(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
/* fail if error was not end of file, otherwise, lower score */ /* fail if error was not end of file, otherwise, lower score */
if (ret != AVERROR_EOF) { if (ret != AVERROR_EOF) {
av_free(buf); av_free(buf);
...@@ -585,7 +585,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, ...@@ -585,7 +585,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt,
} }
/* rewind. reuse probe buffer to avoid seeking */ /* rewind. reuse probe buffer to avoid seeking */
if ((ret = ff_rewind_with_probe_data(*pb, buf, pd.buf_size)) < 0) if ((ret = ff_rewind_with_probe_data(pb, buf, pd.buf_size)) < 0)
av_free(buf); av_free(buf);
return ret; return ret;
...@@ -622,7 +622,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, ...@@ -622,7 +622,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
if (buf_size > 0) { if (buf_size > 0) {
url_setbufsize(pb, buf_size); url_setbufsize(pb, buf_size);
} }
if (!fmt && (err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { if (!fmt && (err = ff_probe_input_buffer(pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) {
goto fail; goto fail;
} }
} }
......
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