diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:58 +0200 |
| commit | dcc800924925855df5dcb2cb8ee5263ded3fd84c (patch) | |
| tree | e36025ada7d36b4c81adf0d73230e8bd7331ed8e | |
| parent | fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e (diff) | |
| parent | 5549f693d2181b3211427f65e48eaa2f4fc5a402 (diff) | |
| download | ffmpeg-dcc800924925855df5dcb2cb8ee5263ded3fd84c.tar.gz | |
Merge commit '5549f693d2181b3211427f65e48eaa2f4fc5a402' into release/2.4
* commit '5549f693d2181b3211427f65e48eaa2f4fc5a402':
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 8a5b99f227..491c4c4efd 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -121,7 +121,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); |