Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)
* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33':
  mjpegenc: cosmetics, reformat jpeg_put_comments()

Conflicts:
libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mjpegenc.c

@@@ -164,18 -153,17 +164,17 @@@ static void jpeg_put_comments(AVCodecCo
      int size;
      uint8_t *ptr;
  
-     if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0)
-     {
-     /* JFIF header */
-     put_marker(p, APP0);
-     put_bits(p, 16, 16);
-     avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
-     put_bits(p, 16, 0x0102); /* v 1.02 */
-     put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
-     put_bits(p, 16, avctx->sample_aspect_ratio.num);
-     put_bits(p, 16, avctx->sample_aspect_ratio.den);
-     put_bits(p, 8, 0); /* thumbnail width */
-     put_bits(p, 8, 0); /* thumbnail height */
+     if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
+         /* JFIF header */
+         put_marker(p, APP0);
+         put_bits(p, 16, 16);
+         avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
 -        put_bits(p, 16, 0x0201);         /* v 1.02 */
++        put_bits(p, 16, 0x0102);         /* v 1.02 */
+         put_bits(p,  8, 0);              /* units type: 0 - aspect ratio */
+         put_bits(p, 16, avctx->sample_aspect_ratio.num);
+         put_bits(p, 16, avctx->sample_aspect_ratio.den);
+         put_bits(p, 8, 0); /* thumbnail width */
+         put_bits(p, 8, 0); /* thumbnail height */
      }
  
      /* comment */