Mercurial > libavcodec.hg
comparison mjpeg.c @ 1092:f59c3f66363b libavcodec
MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
bitexact cleanup
author | michaelni |
---|---|
date | Mon, 03 Mar 2003 14:54:00 +0000 |
parents | b32afefe7d33 |
children | 1e39f273ecd6 |
comparison
equal
deleted
inserted
replaced
1091:03df246fb06b | 1092:f59c3f66363b |
---|---|
384 put_bits(p, 8, 0); /* thumbnail width */ | 384 put_bits(p, 8, 0); /* thumbnail width */ |
385 put_bits(p, 8, 0); /* thumbnail height */ | 385 put_bits(p, 8, 0); /* thumbnail height */ |
386 } | 386 } |
387 | 387 |
388 /* comment */ | 388 /* comment */ |
389 if(!ff_bit_exact){ | 389 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
390 put_marker(p, COM); | 390 put_marker(p, COM); |
391 flush_put_bits(p); | 391 flush_put_bits(p); |
392 ptr = pbBufPtr(p); | 392 ptr = pbBufPtr(p); |
393 put_bits(p, 16, 0); /* patched later */ | 393 put_bits(p, 16, 0); /* patched later */ |
394 #define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR | 394 #define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR |
701 MJpegDecodeContext *s = avctx->priv_data; | 701 MJpegDecodeContext *s = avctx->priv_data; |
702 MpegEncContext s2; | 702 MpegEncContext s2; |
703 | 703 |
704 s->avctx = avctx; | 704 s->avctx = avctx; |
705 | 705 |
706 /* ugly way to get the idct & scantable */ | 706 /* ugly way to get the idct & scantable FIXME */ |
707 memset(&s2, 0, sizeof(MpegEncContext)); | 707 memset(&s2, 0, sizeof(MpegEncContext)); |
708 s2.flags= avctx->flags; | 708 s2.flags= avctx->flags; |
709 s2.avctx= avctx; | 709 s2.avctx= avctx; |
710 // s2->out_format = FMT_MJPEG; | 710 // s2->out_format = FMT_MJPEG; |
711 s2.width = 8; | 711 s2.width = 8; |
712 s2.height = 8; | 712 s2.height = 8; |
713 if (MPV_common_init(&s2) < 0) | 713 if (MPV_common_init(&s2) < 0) |
714 return -1; | 714 return -1; |
715 s->scantable= s2.intra_scantable; | 715 s->scantable= s2.intra_scantable; |
716 s->idct_put= s2.idct_put; | 716 s->idct_put= s2.dsp.idct_put; |
717 MPV_common_end(&s2); | 717 MPV_common_end(&s2); |
718 | 718 |
719 s->mpeg_enc_ctx_allocated = 0; | 719 s->mpeg_enc_ctx_allocated = 0; |
720 s->buffer_size = 102400; /* smaller buffer should be enough, | 720 s->buffer_size = 102400; /* smaller buffer should be enough, |
721 but photojpg files could ahive bigger sizes */ | 721 but photojpg files could ahive bigger sizes */ |