virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/export av_vorbis_parse_frame_flags()

Browse Source 
The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-06 11:54:40 +01:00
parent 44fa2671e0
commit 7ffdc7bef2
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/version.h
View File

@@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 11 #define LIBAVCODEC_VERSION_MINOR 12
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

11
libavcodec/vorbis_parser.c
View File

@@ -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 av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
int buf_size, int *flags) 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 av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
int buf_size) 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 #endif
#if CONFIG_VORBIS_PARSER #if CONFIG_VORBIS_PARSER

7
libavcodec/vorbis_parser.h
View File

@@ -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 * If @p flags is @c NULL,
* this in order for a correct duration to be returned. If @p flags is @c NULL,
* special frames are considered invalid. * special frames are considered invalid.
* *
* @param s Vorbis parser context * @param s Vorbis parser context
@@ -58,8 +57,8 @@ void av_vorbis_parse_free(AVVorbisParseContext **s);
* @param buf_size size of the buffer * @param buf_size size of the buffer
* @param flags flags for special frames * @param flags flags for special frames
*/ */
int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf, int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
int buf_size, int *flags); int buf_size, int *flags);
/** /**
* Get the duration for a Vorbis packet. * Get the duration for a Vorbis packet.

15
libavcodec/vorbis_parser_internal.h
View File

@@ -52,6 +52,21 @@ struct AVVorbisParseContext {
*/ */
int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s); 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
* 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. * Get the duration for a Vorbis packet.
* *