avcodec/export av_vorbis_parse_frame_flags()

The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 28ceb4d..5d2c9a2 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56

-#define LIBAVCODEC_VERSION_MINOR  11
+#define LIBAVCODEC_VERSION_MINOR  12

 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c
index 0c93e31..ab08a6a 100644 (file)
--- a/libavcodec/vorbis_parser.c
+++ b/libavcodec/vorbis_parser.c
@@ -210,8 +210,8 @@ static int vorbis_parse_init(AVVorbisParseContext *s,
     return 0;
 }
 
     return 0;
 }
 

-int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
-                                    int buf_size, int *flags)
+int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
+                                int buf_size, int *flags)

 {
     int duration = 0;
 
 {
     int duration = 0;
 


@@ -262,7 +262,7 @@ bad_packet:
 int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
                           int buf_size)
 {
 int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
                           int buf_size)
 {

-    return avpriv_vorbis_parse_frame_flags(s, buf, buf_size, NULL);
+    return av_vorbis_parse_frame_flags(s, buf, buf_size, NULL);

 }
 
 void av_vorbis_parse_reset(AVVorbisParseContext *s)
 }
 
 void av_vorbis_parse_reset(AVVorbisParseContext *s)


@@ -308,6 +308,11 @@ int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
 {
     return av_vorbis_parse_frame(s, buf, buf_size);
 }
 {
     return av_vorbis_parse_frame(s, buf, buf_size);
 }

+int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
+                                    int buf_size, int *flags)
+{
+    return av_vorbis_parse_frame_flags(s, buf, buf_size, flags);
+}

 #endif
 
 #if CONFIG_VORBIS_PARSER
 #endif
 
 #if CONFIG_VORBIS_PARSER

diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h
index 4af60cf..086e364 100644 (file)
--- a/libavcodec/vorbis_parser.h
+++ b/libavcodec/vorbis_parser.h
@@ -49,8 +49,7 @@ void av_vorbis_parse_free(AVVorbisParseContext **s);
 /**
  * Get the duration for a Vorbis packet.
  *
 /**
  * Get the duration for a Vorbis packet.
  *

- * avpriv_vorbis_parse_extradata() must have been successfully called prior to
- * this in order for a correct duration to be returned. If @p flags is @c NULL,
+ * If @p flags is @c NULL,

  * special frames are considered invalid.
  *
  * @param s        Vorbis parser context
  * special frames are considered invalid.
  *
  * @param s        Vorbis parser context


@@ -58,8 +57,8 @@ void av_vorbis_parse_free(AVVorbisParseContext **s);
  * @param buf_size size of the buffer
  * @param flags    flags for special frames
  */
  * @param buf_size size of the buffer
  * @param flags    flags for special frames
  */

-int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
-                                    int buf_size, int *flags);
+int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
+                                int buf_size, int *flags);

 
 /**
  * Get the duration for a Vorbis packet.
 
 /**
  * Get the duration for a Vorbis packet.

diff --git a/libavcodec/vorbis_parser_internal.h b/libavcodec/vorbis_parser_internal.h
index 885793f..49481ee 100644 (file)
--- a/libavcodec/vorbis_parser_internal.h
+++ b/libavcodec/vorbis_parser_internal.h
@@ -56,6 +56,21 @@ int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s
  * Get the duration for a Vorbis packet.
  *
  * avpriv_vorbis_parse_extradata() must have been successfully called prior to
  * Get the duration for a Vorbis packet.
  *
  * avpriv_vorbis_parse_extradata() must have been successfully called prior to

+ * this in order for a correct duration to be returned. If @p flags is @c NULL,
+ * special frames are considered invalid.
+ *
+ * @param s        Vorbis parser context
+ * @param buf      buffer containing a Vorbis frame
+ * @param buf_size size of the buffer
+ * @param flags    flags for special frames
+ */
+int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
+                                    int buf_size, int *flags);
+
+/**
+ * Get the duration for a Vorbis packet.
+ *
+ * avpriv_vorbis_parse_extradata() must have been successfully called prior to

  * this in order for a correct duration to be returned.
  *
  * @param s        Vorbis parser context
  * this in order for a correct duration to be returned.
  *
  * @param s        Vorbis parser context