virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove unnecessary width and height variables from v4l2_read_header().

Browse Source 
Originally committed as revision 22963 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-04-25 18:47:40 +00:00
parent 4cf1ba0445
commit 18225025ff
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavdevice/v4l2.c
View File

@ -582,7 +582,6 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{ {
struct video_data *s = s1->priv_data; struct video_data *s = s1->priv_data;
AVStream *st; AVStream *st;
int width, height;
int res; int res;
uint32_t desired_format, capabilities; uint32_t desired_format, capabilities;
enum CodecID codec_id; enum CodecID codec_id;
@ -592,9 +591,6 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return -1; return -1;
} }
width = ap->width;
height = ap->height;
if(avcodec_check_dimensions(s1, ap->width, ap->height) < 0) if(avcodec_check_dimensions(s1, ap->width, ap->height) < 0)
return -1; return -1;
@ -604,8 +600,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
} }
av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
s->width = width; s->width = ap->width;
s->height = height; s->height = ap->height;
capabilities = 0; capabilities = 0;
s->fd = device_open(s1, &capabilities); s->fd = device_open(s1, &capabilities);
@ -614,7 +610,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
} }
av_log(s1, AV_LOG_INFO, "[%d]Capabilities: %x\n", s->fd, capabilities); av_log(s1, AV_LOG_INFO, "[%d]Capabilities: %x\n", s->fd, capabilities);
desired_format = device_try_init(s1, ap, &width, &height, &codec_id); desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id);
if (desired_format == 0) { if (desired_format == 0) {
av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for "
"codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt); "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt);
@ -628,7 +624,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EIO); return AVERROR(EIO);
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
s->frame_size = avpicture_get_size(st->codec->pix_fmt, width, height); s->frame_size = avpicture_get_size(st->codec->pix_fmt, s->width, s->height);
if (capabilities & V4L2_CAP_STREAMING) { if (capabilities & V4L2_CAP_STREAMING) {
s->io_method = io_mmap; s->io_method = io_mmap;
res = mmap_init(s1); res = mmap_init(s1);
@ -648,8 +644,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
st->codec->width = width; st->codec->width = s->width;
st->codec->height = height; st->codec->height = s->height;
st->codec->time_base.den = ap->time_base.den; st->codec->time_base.den = ap->time_base.den;
st->codec->time_base.num = ap->time_base.num; st->codec->time_base.num = ap->time_base.num;
st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8; st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8;