aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiina Hideaki <shiina@yndrd.com>2015-05-07 01:46:55 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-05-19 12:15:00 +0100
commit5549f693d2181b3211427f65e48eaa2f4fc5a402 (patch)
tree23ce4d8d90f05fa83fcd6e5883281c81d1ada799
parent1f64b018cbec018fa66a4a20f79958d9707913de (diff)
downloadffmpeg-5549f693d2181b3211427f65e48eaa2f4fc5a402.tar.gz
mjpegenc: Fix JFIF header byte ordering
The header had a wrong version description. Bug-Id: 808 Signed-off-by: Shiina Hideaki <shiina@yndrd.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavcodec/mjpegenc_common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index adb335e5e1..9373e4a467 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -96,7 +96,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, 0x0201); /* 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);