diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
| commit | f35439699f5546774b840ae9fba7df82729ef0ff (patch) | |
| tree | 92c22313b8eda656421372955598d647aa64242e /libavcodec/parser.c | |
| parent | 85c9365d65c4d03c468cead13f722ddce89d8495 (diff) | |
| parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
| download | ffmpeg-f35439699f5546774b840ae9fba7df82729ef0ff.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index d877f5d411..414a564b7d 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, |