diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/parser.c | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
| download | ffmpeg-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.tar.gz | |
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 127ba8bd3d..cd1bcbcee2 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -165,11 +165,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, @@ -215,10 +210,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){ |