virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'

Browse Source 
* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33':
  mjpegenc: cosmetics, reformat jpeg_put_comments()

Conflicts:
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-06 04:25:56 +01:00
parent fb06b8ba93 a1ba1f20b3
commit b22c16daaf
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mjpegenc.c
View File

@ -164,8 +164,7 @@ 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);
@ -189,9 +188,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);