diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2011-02-08 00:46:52 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-08 18:25:11 -0500 |
| commit | aad216fd7e3209fe0a865d8751e680925f6654d3 (patch) | |
| tree | a8a71a9a17c60957157db0419446d407eb3b36cd /libavformat | |
| parent | 4d016dd4e5b288b3c0c7396935326cb07a289ac2 (diff) | |
| download | ffmpeg-aad216fd7e3209fe0a865d8751e680925f6654d3.tar.gz | |
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: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 2482b6d02b..fc4ee216c1 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -97,7 +97,7 @@ uint64_t ff_ntp_time(void); * @return 0 in case of success, a negative value corresponding to an * 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, unsigned int offset, unsigned int max_probe_size); diff --git a/libavformat/utils.c b/libavformat/utils.c index 4f71f8c0a4..505c2db4cf 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -524,7 +524,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, #define PROBE_BUF_MIN 2048 #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, unsigned int offset, unsigned int max_probe_size) { @@ -555,7 +555,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, /* read probe data */ 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 */ if (ret != AVERROR_EOF) { av_free(buf); @@ -585,7 +585,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, } /* 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); return ret; @@ -622,7 +622,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, if (buf_size > 0) { 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; } } |