@@ -13,6 +13,10 @@ libavutil:   2009-03-08

 API changes, most recent first:

+2011-02-08 - xxxxxxx - lavf 52.98.0 - av_probe_input_buffer

+  Add av_probe_input_buffer() to avformat.h for probing format from a

+  ByteIOContext.

+

 2011-02-06 - fe174fc - lavf 52.97.0 - avio.h

   Add flag for non-blocking protocols: URL_FLAG_NONBLOCK

@@ -1039,6 +1039,25 @@ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);

 AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);

 /**

+ * Probe a bytestream to determine the input format. Each time a probe returns

+ * with a score that is too low, the probe buffer size is increased and another

+ * attempt is made. When the maximum probe size is reached, the input format

+ * with the highest score is returned.

+ *

+ * @param pb the bytestream to probe

+ * @param fmt the input format is put here

+ * @param filename the filename of the stream

+ * @param logctx the log context

+ * @param offset the offset within the bytestream to probe from

+ * @param max_probe_size the maximum probe buffer size (zero for default)

+ * @return 0 in case of success, a negative value corresponding to an

+ * AVERROR code otherwise

+ */

+int av_probe_input_buffer(ByteIOContext *pb, AVInputFormat **fmt,

+                          const char *filename, void *logctx,

+                          unsigned int offset, unsigned int max_probe_size);

+

+/**

  * Allocate all the structures needed to read an input stream.

  *        This does not open the needed codecs for decoding the stream[s].

  */

@@ -82,25 +82,6 @@ void ff_read_frame_flush(AVFormatContext *s);

 /** Get the current time since NTP epoch in microseconds. */

 uint64_t ff_ntp_time(void);

-/**

- * Probe a bytestream to determine the input format. Each time a probe returns

- * with a score that is too low, the probe buffer size is increased and another

- * attempt is made. When the maximum probe size is reached, the input format

- * with the highest score is returned.

- *

- * @param pb the bytestream to probe

- * @param fmt the input format is put here

- * @param filename the filename of the stream

- * @param logctx the log context

- * @param offset the offset within the bytestream to probe from

- * @param max_probe_size the maximum probe buffer size (zero for default)

- * @return 0 in case of success, a negative value corresponding to an

- * AVERROR code otherwise

- */

-int ff_probe_input_buffer(ByteIOContext *pb, AVInputFormat **fmt,

-                          const char *filename, void *logctx,

-                          unsigned int offset, unsigned int max_probe_size);

-

 #if FF_API_URL_SPLIT

 /**

  * @deprecated use av_url_split() instead

@@ -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 av_probe_input_buffer(ByteIOContext *pb, AVInputFormat **fmt,

                           const char *filename, void *logctx,

                           unsigned int offset, unsigned int max_probe_size)

 {

@@ -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 = av_probe_input_buffer(pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) {

             goto fail;

         }

     }

@@ -24,7 +24,7 @@

 #include "libavutil/avutil.h"

 #define LIBAVFORMAT_VERSION_MAJOR 52

-#define LIBAVFORMAT_VERSION_MINOR 97

+#define LIBAVFORMAT_VERSION_MINOR 98

 #define LIBAVFORMAT_VERSION_MICRO  0

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \