Skip to content

F
ffmpeg.wasm-core
Commit a1ba1f20 authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

mjpegenc: cosmetics, reformat jpeg_put_comments()

parent 0812f5a4
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 15 deletions
libavcodec/mjpegenc.c
View file @ a1ba1f20
...@@ -153,18 +153,17 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) ...@@ -153,18 +153,17 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
int size; int size;
uint8_t *ptr; uint8_t *ptr;
if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
{ /* JFIF header */
/* JFIF header */ 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, 0x0201); /* v 1.02 */
put_bits(p, 16, 0x0201); /* v 1.02 */ 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); put_bits(p, 8, 0); /* thumbnail width */
put_bits(p, 8, 0); /* thumbnail width */ put_bits(p, 8, 0); /* thumbnail height */
put_bits(p, 8, 0); /* thumbnail height */
} }
/* comment */ /* comment */
...@@ -178,9 +177,9 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) ...@@ -178,9 +177,9 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
AV_WB16(ptr, size); AV_WB16(ptr, size);
} }
if( avctx->pix_fmt == AV_PIX_FMT_YUV420P if (avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
||avctx->pix_fmt == AV_PIX_FMT_YUV422P avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
||avctx->pix_fmt == AV_PIX_FMT_YUV444P){ avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
put_marker(p, COM); put_marker(p, COM);
flush_put_bits(p); flush_put_bits(p);
ptr = put_bits_ptr(p); ptr = put_bits_ptr(p);
......
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