diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:18:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:19:05 +0200 |
| commit | 3bf81d389638199ebdbe8f2d302b4c2a7f6563d2 (patch) | |
| tree | 86e0c5500a1f4a41c1304d71d47b766165bf0444 | |
| parent | 53d2b69b72b0bac919f3083298d3ad914ea86735 (diff) | |
| parent | 85ca012ba680bdf942d95ab98c74f6a28f447588 (diff) | |
| download | ffmpeg-3bf81d389638199ebdbe8f2d302b4c2a7f6563d2.tar.gz | |
Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'
* commit '85ca012ba680bdf942d95ab98c74f6a28f447588':
mjpegenc: Fix JFIF header byte ordering
Conflicts:
libavcodec/mjpegenc_common.c
See: b19313218c32fa9446d474cbddb11c0776868cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpegenc_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 3e3b7cd6ed..c55a353a17 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -123,7 +123,10 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) 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 */ + /* The most significant byte is used for major revisions, the least + * significant byte for minor revisions. Version 1.02 is the current + * released revision. */ + put_bits(p, 16, 0x0102); 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); |