Commit 23f9002a authored by ramiro's avatar ramiro

vfwcap: Reorder some code to simplify next patch.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19543 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cc82e62f
...@@ -319,19 +319,18 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -319,19 +319,18 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->codec_type = CODEC_TYPE_VIDEO; codec->codec_type = CODEC_TYPE_VIDEO;
codec->width = width; codec->width = width;
codec->height = height; codec->height = height;
codec->codec_id = CODEC_ID_RAWVIDEO;
codec->pix_fmt = vfw_pixfmt(biCompression, biBitCount); codec->pix_fmt = vfw_pixfmt(biCompression, biBitCount);
if(biCompression == BI_RGB)
codec->bits_per_coded_sample = biBitCount;
av_set_pts_info(st, 32, 1, 1000);
if(codec->pix_fmt == PIX_FMT_NONE) { if(codec->pix_fmt == PIX_FMT_NONE) {
av_log(s, AV_LOG_ERROR, "Unknown compression type. " av_log(s, AV_LOG_ERROR, "Unknown compression type. "
"Please report verbose (-v 9) debug information.\n"); "Please report verbose (-v 9) debug information.\n");
vfw_read_close(s); vfw_read_close(s);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
codec->codec_id = CODEC_ID_RAWVIDEO;
if(biCompression == BI_RGB)
codec->bits_per_coded_sample = biBitCount;
av_set_pts_info(st, 32, 1, 1000);
ctx->mutex = CreateMutex(NULL, 0, NULL); ctx->mutex = CreateMutex(NULL, 0, NULL);
if(!ctx->mutex) { if(!ctx->mutex) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment