* commit '85ca012ba680bdf942d95ab98c74f6a28f447588': mjpegenc: Fix JFIF header byte ordering Conflicts: libavcodec/mjpegenc_common.c
Unified · Split
| @@ -123,7 +123,10 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) · 122 unmodified lines | |||
| 123 | put_marker(p, APP0); | 123 | put_marker(p, APP0); |
| 124 | put_bits(p, 16, 16); | 124 | put_bits(p, 16, 16); |
| 125 | avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ | 125 | avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ |
| 126 | put_bits(p, 16, 0x0102); /* v 1.02 */ | 126 | /* The most significant byte is used for major revisions, the least |
| 127 | * significant byte for minor revisions. Version 1.02 is the current | ||
| 128 | * released revision. */ | ||
| 129 | put_bits(p, 16, 0x0102); | ||
| 127 | put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ | 130 | put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
| 128 | put_bits(p, 16, avctx->sample_aspect_ratio.num); | 131 | put_bits(p, 16, avctx->sample_aspect_ratio.num); |
| 129 | put_bits(p, 16, avctx->sample_aspect_ratio.den); | 132 | put_bits(p, 16, avctx->sample_aspect_ratio.den); |