From 1de9317bd08d71b6b988a8a64de18f4c2f98e031 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 11 Sep 2012 14:39:58 +0300 Subject: rtpdec_jpeg: Fold the default qtables case into an existing if statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpdec_jpeg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libavformat/rtpdec_jpeg.c') diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 9dd5f68764..3f47e71bd3 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -303,6 +303,10 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, qtables = &jpeg->qtables[q - 128][0]; qtable_len = jpeg->qtables_len[q - 128]; } + } else { /* q <= 127 */ + create_default_qtables(new_qtables, q); + qtables = new_qtables; + qtable_len = sizeof(new_qtables); } /* Skip the current frame in case of the end packet @@ -313,12 +317,6 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, return ret; jpeg->timestamp = *timestamp; - if (!qtables) { - create_default_qtables(new_qtables, q); - qtables = new_qtables; - qtable_len = sizeof(new_qtables); - } - /* Generate a frame and scan headers that can be prepended to the * RTP/JPEG data payload to produce a JPEG compressed image in * interchange format. */ -- cgit v1.2.3