aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-02 11:55:04 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-02 16:17:15 +0200
commit9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d (patch)
tree2002c166004039face58e60469b679ed43a6b0c3
parent6f3d3eacf627a8c677384b73c6385e9b8a7095df (diff)
downloadffmpeg-9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d.tar.gz
parser: mark av_parser_parse() for removal on next major bump
Fixes build with the bump, since the prototype is already marked for removal.
-rw-r--r--libavcodec/parser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index e09e598760..0c69b91754 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,