diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-04-21 14:39:52 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-04-21 14:39:52 +0000 |
| commit | 41f53f86944ce4cc4919d732591d5d086127e183 (patch) | |
| tree | 63e5e584dd50d6cf2f48f9facac721beae3bf06f /libavformat/jpeg.c | |
| parent | e352ff0895df85594dd8df385a650d45b74a28e3 (diff) | |
| download | ffmpeg-41f53f86944ce4cc4919d732591d5d086127e183.tar.gz | |
use correct YUV format for JPEG
Originally committed as revision 1804 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/jpeg.c')
| -rw-r--r-- | libavformat/jpeg.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/libavformat/jpeg.c b/libavformat/jpeg.c index db4bd81aa6..c4cea78de5 100644 --- a/libavformat/jpeg.c +++ b/libavformat/jpeg.c @@ -42,7 +42,19 @@ static int jpeg_get_buffer(AVCodecContext *c, AVFrame *picture) info->width = c->width; info->height = c->height; - info->pix_fmt = c->pix_fmt; + switch(c->pix_fmt) { + case PIX_FMT_YUV420P: + info->pix_fmt = PIX_FMT_YUVJ420P; + break; + case PIX_FMT_YUV422P: + info->pix_fmt = PIX_FMT_YUVJ422P; + break; + case PIX_FMT_YUV444P: + info->pix_fmt = PIX_FMT_YUVJ444P; + break; + default: + return -1; + } ret = jctx->alloc_cb(jctx->opaque, info); if (ret) { jctx->ret_code = ret; @@ -164,7 +176,20 @@ static int jpeg_write(ByteIOContext *pb, AVImageInfo *info) goto fail2; c->width = info->width; c->height = info->height; - c->pix_fmt = info->pix_fmt; + /* XXX: currently move that to the codec ? */ + switch(info->pix_fmt) { + case PIX_FMT_YUVJ420P: + c->pix_fmt = PIX_FMT_YUV420P; + break; + case PIX_FMT_YUVJ422P: + c->pix_fmt = PIX_FMT_YUV422P; + break; + case PIX_FMT_YUVJ444P: + c->pix_fmt = PIX_FMT_YUV444P; + break; + default: + goto fail1; + } for(i=0;i<3;i++) { picture->data[i] = info->pict.data[i]; picture->linesize[i] = info->pict.linesize[i]; @@ -202,6 +227,6 @@ AVImageFormat jpeg_image_format = { "jpg,jpeg", jpeg_probe, jpeg_read, - (1 << PIX_FMT_YUV420P) | (1 << PIX_FMT_YUV422P) | (1 << PIX_FMT_YUV444P), + (1 << PIX_FMT_YUVJ420P) | (1 << PIX_FMT_YUVJ422P) | (1 << PIX_FMT_YUVJ444P), jpeg_write, }; |