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 /libavformat/lxfdec.c | |
| 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 'libavformat/lxfdec.c')
| -rw-r--r-- | libavformat/lxfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 20978c674e..0907cb71c0 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -218,7 +218,7 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) return ret < 0 ? ret : AVERROR_EOF; if (!(st = av_new_stream(s, 0))) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); st->duration = AV_RL32(&header_data[32]); video_params = AV_RL32(&header_data[40]); @@ -244,7 +244,7 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) if ((lxf->channels = (disk_params >> 2) & 0xF)) { if (!(st = av_new_stream(s, 1))) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->sample_rate = LXF_SAMPLERATE; |