diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 05:32:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 05:32:26 +0400 |
| commit | c0e51ec9c625ccd7b3a8c74754145e6c023a3848 (patch) | |
| tree | 9b8e987ec11d8104cde5269008bb0d21aaac89b7 /libavformat/rtpdec_qt.c | |
| parent | 4b9c03b7f08f51fea3c8719f169368a46a0d3b63 (diff) | |
| parent | 1f6265e011f6e56562b2f58c182bc0261062b3c4 (diff) | |
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/rtpdec_qt.c')
| -rw-r--r-- | libavformat/rtpdec_qt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 206ed347b4..7df11b3d93 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -98,7 +98,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, if (!is_start || !is_finish) { av_log_missing_feature(s, "RTP-X-QT with payload description " "split over several packets", 1); - return AVERROR_NOTSUPP; + return AVERROR(ENOSYS); } skip_bits(&gb, 12); // reserved data_len = get_bits(&gb, 16); @@ -161,7 +161,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, if (has_packet_info) { av_log_missing_feature(s, "RTP-X-QT with packet specific info", 1); - return AVERROR_NOTSUPP; + return AVERROR(ENOSYS); } alen = len - avio_tell(&pb); @@ -224,7 +224,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, default: /* unimplemented */ av_log_missing_feature(NULL, "RTP-X-QT with packing scheme 2", 1); - return AVERROR_NOTSUPP; + return AVERROR(ENOSYS); } } |