Mercurial > libavcodec.hg
comparison mjpeg.c @ 5005:3aba3479d806 libavcodec
remove some unused mjpeg encoding variables
(they were always set to a constant value)
| author | aurel |
|---|---|
| date | Mon, 14 May 2007 11:53:27 +0000 |
| parents | 5c3c39298e91 |
| children | eb0ad6423405 |
comparison
equal
deleted
inserted
replaced
| 5004:5c3c39298e91 | 5005:3aba3479d806 |
|---|---|
| 336 { | 336 { |
| 337 const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; | 337 const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; |
| 338 | 338 |
| 339 put_marker(&s->pb, SOI); | 339 put_marker(&s->pb, SOI); |
| 340 | 340 |
| 341 if (!s->mjpeg_data_only_frames) | |
| 342 { | |
| 343 jpeg_put_comments(s); | 341 jpeg_put_comments(s); |
| 344 | 342 |
| 345 if (s->mjpeg_write_tables) jpeg_table_header(s); | 343 jpeg_table_header(s); |
| 346 | 344 |
| 347 switch(s->avctx->codec_id){ | 345 switch(s->avctx->codec_id){ |
| 348 case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; | 346 case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; |
| 349 case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break; | 347 case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break; |
| 350 default: assert(0); | 348 default: assert(0); |
| 382 #ifdef TWOMATRIXES | 380 #ifdef TWOMATRIXES |
| 383 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */ | 381 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */ |
| 384 #else | 382 #else |
| 385 put_bits(&s->pb, 8, 0); /* select matrix */ | 383 put_bits(&s->pb, 8, 0); /* select matrix */ |
| 386 #endif | 384 #endif |
| 387 } | |
| 388 | 385 |
| 389 /* scan header */ | 386 /* scan header */ |
| 390 put_marker(&s->pb, SOS); | 387 put_marker(&s->pb, SOS); |
| 391 put_bits(&s->pb, 16, 12); /* length */ | 388 put_bits(&s->pb, 16, 12); /* length */ |
| 392 put_bits(&s->pb, 8, 3); /* 3 components */ | 389 put_bits(&s->pb, 8, 3); /* 3 components */ |