[FFmpeg-cvslog] parser: mark av_parser_parse() for removal on next major bump
Anton Khirnov
git at videolan.org
Sun Apr 3 02:35:24 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Apr 2 11:55:04 2011 +0200| [9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d] | committer: Anton Khirnov
parser: mark av_parser_parse() for removal on next major bump
Fixes build with the bump, since the prototype is already marked for
removal.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d
---
libavcodec/parser.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index e09e598..0c69b91 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -105,6 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
}
}
+#if LIBAVCODEC_VERSION_MINOR < 53
/**
*
* @param buf input
@@ -139,6 +140,7 @@ int av_parser_parse(AVCodecParserContext *s,
{
return av_parser_parse2(s, avctx, poutbuf, poutbuf_size, buf, buf_size, pts, dts, AV_NOPTS_VALUE);
}
+#endif
int av_parser_parse2(AVCodecParserContext *s,
AVCodecContext *avctx,
More information about the ffmpeg-cvslog
mailing list