[11/13] rtpdec_jpeg: Fold the default qtables case into an existing if statement

Message ID 1347363979-4676-11-git-send-email-martin@martin.st
State Committed
Commit 1de9317bd08d71b6b988a8a64de18f4c2f98e031
Headers show

Commit Message

Martin Storsjö Sept. 11, 2012, 11:46 a.m.
---
 libavformat/rtpdec_jpeg.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Luca Barbato Sept. 11, 2012, 4:42 p.m. | #1
On 9/11/12 1:46 PM, Martin Storsjö wrote:
> ---
>   libavformat/rtpdec_jpeg.c |   10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
>

Ok.

Patch

diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 1b7b69d..9c0e693 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. */