diff options
| author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-27 08:44:27 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-27 08:44:27 +0000 |
| commit | 76f47eebd91d1f44252717a5af4c4f9979ebb24b (patch) | |
| tree | 8cb82cbe6265e7a9796f18774e72c31d86295e4a /libvo | |
| parent | 39e4226e59d987d2f39fa7fc4fd567810f322282 (diff) | |
| download | mpv-76f47eebd91d1f44252717a5af4c4f9979ebb24b.tar.bz2 mpv-76f47eebd91d1f44252717a5af4c4f9979ebb24b.tar.xz | |
compilation fix: ff_ _encode added and temporarily disabled mjpeg_write_tables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23387 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/jpeg_enc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 4e430ff16e..a43ddd470e 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -314,7 +314,6 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->height = h; j->s->qscale = q; - j->s->mjpeg_data_only_frames = 0; j->s->out_format = FMT_MJPEG; j->s->intra_only = 1; j->s->encoding = 1; @@ -322,7 +321,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->y_dc_scale = 8; j->s->c_dc_scale = 8; - j->s->mjpeg_write_tables = 1; + //FIXME j->s->mjpeg_write_tables = 1; j->s->mjpeg_vsample[0] = 1; j->s->mjpeg_vsample[1] = 1; j->s->mjpeg_vsample[2] = 1; @@ -343,7 +342,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, avcodec_inited=1; } - if (mjpeg_init(j->s) < 0) { + if (ff_mjpeg_encode_init(j->s) < 0) { av_free(j->s); av_free(j); return NULL; @@ -385,7 +384,7 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data, init_put_bits(&j->s->pb, bufr, 1024*256); - mjpeg_picture_header(j->s); + ff_mjpeg_encode_picture_header(j->s); j->s->header_bits = put_bits_count(&j->s->pb); @@ -490,17 +489,18 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data, } } emms_c(); - mjpeg_picture_trailer(j->s); + ff_mjpeg_encode_picture_trailer(j->s); flush_put_bits(&j->s->pb); - if (j->s->mjpeg_write_tables == 1) - j->s->mjpeg_write_tables = 0; + //FIXME + //if (j->s->mjpeg_write_tables == 1) + // j->s->mjpeg_write_tables = 0; return pbBufPtr(&(j->s->pb)) - j->s->pb.buf; } void jpeg_enc_uninit(jpeg_enc_t *j) { - mjpeg_close(j->s); + ff_mjpeg_encode_close(j->s); av_free(j->s); av_free(j); } |