diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
| commit | 18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch) | |
| tree | 2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /libavformat | |
| parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
| parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) | |
| download | ffmpeg-streaming-18884f159b617208dd69fb35fa127f4fdedf5ba1.zip ffmpeg-streaming-18884f159b617208dd69fb35fa127f4fdedf5ba1.tar.gz | |
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec_qt.c | 6 | ||||
| -rw-r--r-- | libavformat/rtpdec_xiph.c | 2 | ||||
| -rw-r--r-- | libavformat/smjpegdec.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 4decdca..f0f01d9 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -99,7 +99,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(ENOSYS); + return AVERROR_PATCHWELCOME; } skip_bits(&gb, 12); // reserved data_len = get_bits(&gb, 16); @@ -162,7 +162,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(ENOSYS); + return AVERROR_PATCHWELCOME; } alen = len - avio_tell(&pb); @@ -225,7 +225,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(ENOSYS); + return AVERROR_PATCHWELCOME; } } diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index ae10c78..773f4aa 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -242,7 +242,7 @@ static int get_base128(const uint8_t ** buf, const uint8_t * buf_end) /** * Based off parse_packed_headers in Vorbis RTP */ -static unsigned int +static int parse_packed_headers(const uint8_t * packed_headers, const uint8_t * packed_headers_end, AVCodecContext * codec, PayloadContext * xiph_data) diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index d1aad9f..9fcefe7 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -135,8 +135,9 @@ static int smjpeg_read_header(AVFormatContext *s) static int smjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) { SMJPEGContext *sc = s->priv_data; - uint32_t dtype, ret, size, timestamp; + uint32_t dtype, size, timestamp; int64_t pos; + int ret; if (s->pb->eof_reached) return AVERROR_EOF; |
