Skip to content

GitLab

Commit 1de9317b authored by Martin Storsjö's avatar Martin Storsjö
Browse files

rtpdec_jpeg: Fold the default qtables case into an existing if statement 


Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent a218deb8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavformat/rtpdec_jpeg.c
View file @ 1de9317b
...@@ -303,6 +303,10 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, ...@@ -303,6 +303,10 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg,
qtables = &jpeg->qtables[q - 128][0]; qtables = &jpeg->qtables[q - 128][0];
qtable_len = jpeg->qtables_len[q - 128]; 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 /* Skip the current frame in case of the end packet
...@@ -313,12 +317,6 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, ...@@ -313,12 +317,6 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg,
return ret; return ret;
jpeg->timestamp = *timestamp; 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 /* Generate a frame and scan headers that can be prepended to the
* RTP/JPEG data payload to produce a JPEG compressed image in * RTP/JPEG data payload to produce a JPEG compressed image in
* interchange format. */ * interchange format. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment