Module: libav
Branch: master
Commit: 1de9317bd08d71b6b988a8a64de18f4c2f98e031
Author: Martin Storsjö <mar...@martin.st>
Committer: Martin Storsjö <mar...@martin.st>
Date: Tue Sep 11 14:39:58 2012 +0300
rtpdec_jpeg: Fold the default qtables case into an existing if statement
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
libavformat/rtpdec_jpeg.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 9dd5f68..3f47e71 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. */
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
