[FFmpeg-cvslog] parser: Move Doxygen documentation to the header files
Diego Biurrun
git at videolan.org
Sat Nov 3 14:18:22 CET 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Nov 2 12:04:16 2012 +0100| [9a07c1332cfe092b57b5758f22b686ca58806c60] | committer: Diego Biurrun
parser: Move Doxygen documentation to the header files
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a07c1332cfe092b57b5758f22b686ca58806c60
---
libavcodec/avcodec.h | 4 ++++
libavcodec/parser.c | 9 ---------
libavcodec/parser.h | 5 +++++
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 43f7c87..d5968f9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3890,6 +3890,10 @@ int av_parser_parse2(AVCodecParserContext *s,
int64_t pts, int64_t dts,
int64_t pos);
+/**
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ * @deprecated use AVBitstreamFilter
+ */
int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 03f327e..7ace766 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -167,11 +167,6 @@ int av_parser_parse2(AVCodecParserContext *s,
return index;
}
-/**
- *
- * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
- * @deprecated use AVBitstreamFilter
- */
int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
@@ -217,10 +212,6 @@ void av_parser_close(AVCodecParserContext *s)
/*****************************************************/
-/**
- * Combine the (truncated) bitstream to a complete frame.
- * @return -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error
- */
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
{
if(pc->overread){
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 1d029e3..ea1cae2 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -39,6 +39,11 @@ typedef struct ParseContext{
#define END_NOT_FOUND (-100)
+/**
+ * Combine the (truncated) bitstream to a complete frame.
+ * @return -1 if no complete frame could be created,
+ * AVERROR(ENOMEM) if there was a memory allocation error
+ */
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size);
int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf,
int buf_size);
More information about the ffmpeg-cvslog
mailing list