diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 03:32:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 03:32:26 +0200 |
| commit | c0e51ec9c625ccd7b3a8c74754145e6c023a3848 (patch) | |
| tree | 9b8e987ec11d8104cde5269008bb0d21aaac89b7 /libavcodec | |
| parent | 4b9c03b7f08f51fea3c8719f169368a46a0d3b63 (diff) | |
| parent | 1f6265e011f6e56562b2f58c182bc0261062b3c4 (diff) | |
| download | ffmpeg-c0e51ec9c625ccd7b3a8c74754145e6c023a3848.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Fix parser: mark av_parser_parse() for removal on next major bump
swscale: postpone sws_getContext removal until next major bump.
fate: add AAC LATM test
mmst: get rid of deprecated AVERRORs
lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 414a564b7d..34659b7b2f 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -105,7 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ } } -#if LIBAVCODEC_VERSION_MINOR < 53 +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * * @param buf input |