Commit 3bf81d38 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '85ca012b'

* commit '85ca012b':
  mjpegenc: Fix JFIF header byte ordering

Conflicts:
	libavcodec/mjpegenc_common.c

See: b1931321Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 53d2b69b 85ca012b
...@@ -123,7 +123,10 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) ...@@ -123,7 +123,10 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
put_marker(p, APP0); put_marker(p, APP0);
put_bits(p, 16, 16); put_bits(p, 16, 16);
avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ 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, 8, 0); /* units type: 0 - aspect ratio */
put_bits(p, 16, avctx->sample_aspect_ratio.num); put_bits(p, 16, avctx->sample_aspect_ratio.num);
put_bits(p, 16, avctx->sample_aspect_ratio.den); put_bits(p, 16, avctx->sample_aspect_ratio.den);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment