Mercurial > libavcodec.hg
comparison mjpeg.c @ 2885:5dfb90019814 libavcodec
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
author | diego |
---|---|
date | Sun, 18 Sep 2005 21:21:01 +0000 |
parents | 40765c51a7a9 |
children | ef2149182f1c |
comparison
equal
deleted
inserted
replaced
2884:a332778dfa06 | 2885:5dfb90019814 |
---|---|
378 if (s->aspect_ratio_info /* && !lossless */) | 378 if (s->aspect_ratio_info /* && !lossless */) |
379 { | 379 { |
380 /* JFIF header */ | 380 /* JFIF header */ |
381 put_marker(p, APP0); | 381 put_marker(p, APP0); |
382 put_bits(p, 16, 16); | 382 put_bits(p, 16, 16); |
383 put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ | 383 ff_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ |
384 put_bits(p, 16, 0x0201); /* v 1.02 */ | 384 put_bits(p, 16, 0x0201); /* v 1.02 */ |
385 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ | 385 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
386 put_bits(p, 16, s->avctx->sample_aspect_ratio.num); | 386 put_bits(p, 16, s->avctx->sample_aspect_ratio.num); |
387 put_bits(p, 16, s->avctx->sample_aspect_ratio.den); | 387 put_bits(p, 16, s->avctx->sample_aspect_ratio.den); |
388 put_bits(p, 8, 0); /* thumbnail width */ | 388 put_bits(p, 8, 0); /* thumbnail width */ |
393 if(!(s->flags & CODEC_FLAG_BITEXACT)){ | 393 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
394 put_marker(p, COM); | 394 put_marker(p, COM); |
395 flush_put_bits(p); | 395 flush_put_bits(p); |
396 ptr = pbBufPtr(p); | 396 ptr = pbBufPtr(p); |
397 put_bits(p, 16, 0); /* patched later */ | 397 put_bits(p, 16, 0); /* patched later */ |
398 put_string(p, LIBAVCODEC_IDENT, 1); | 398 ff_put_string(p, LIBAVCODEC_IDENT, 1); |
399 size = strlen(LIBAVCODEC_IDENT)+3; | 399 size = strlen(LIBAVCODEC_IDENT)+3; |
400 ptr[0] = size >> 8; | 400 ptr[0] = size >> 8; |
401 ptr[1] = size; | 401 ptr[1] = size; |
402 } | 402 } |
403 | 403 |
406 ||s->avctx->pix_fmt == PIX_FMT_YUV444P){ | 406 ||s->avctx->pix_fmt == PIX_FMT_YUV444P){ |
407 put_marker(p, COM); | 407 put_marker(p, COM); |
408 flush_put_bits(p); | 408 flush_put_bits(p); |
409 ptr = pbBufPtr(p); | 409 ptr = pbBufPtr(p); |
410 put_bits(p, 16, 0); /* patched later */ | 410 put_bits(p, 16, 0); /* patched later */ |
411 put_string(p, "CS=ITU601", 1); | 411 ff_put_string(p, "CS=ITU601", 1); |
412 size = strlen("CS=ITU601")+3; | 412 size = strlen("CS=ITU601")+3; |
413 ptr[0] = size >> 8; | 413 ptr[0] = size >> 8; |
414 ptr[1] = size; | 414 ptr[1] = size; |
415 } | 415 } |
416 } | 416 } |