diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:19:23 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:19:23 +0100 |
| commit | 8a04ddeb4704e1f3c7237d48d95edae08a3193fe (patch) | |
| tree | 7ed131814c8e58162eb7cf644552b02cf134daae | |
| parent | d03da3e24020e9ef7b7558c0f1741331d46c2c21 (diff) | |
| parent | 5049f6b772891cdf4030a9d572362efc8f7ae97f (diff) | |
| download | ffmpeg-8a04ddeb4704e1f3c7237d48d95edae08a3193fe.tar.gz | |
Merge commit '5049f6b772891cdf4030a9d572362efc8f7ae97f'
* commit '5049f6b772891cdf4030a9d572362efc8f7ae97f':
rtpdec_jpeg: Coalesce redundant error checks
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavformat/rtpdec_jpeg.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 6bf88f8c3a..f3a2060523 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -245,12 +245,6 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, len -= 4; type &= ~0x40; } - /* Parse the restart marker header. */ - if (type > 63) { - av_log(ctx, AV_LOG_ERROR, - "Unimplemented RTP/JPEG restart marker header.\n"); - return AVERROR_PATCHWELCOME; - } if (type > 1) { av_log(ctx, AV_LOG_ERROR, "Unimplemented RTP/JPEG type %d\n", type); return AVERROR_PATCHWELCOME; |