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 temporary variable "frame_size" from

Browse Source 
grab_read_header().

Originally committed as revision 16317 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2008-12-26 09:31:21 +00:00
parent fd867ffd43
commit f233d34821
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/v4l.c
View File

@ -70,7 +70,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{ {
VideoData *s = s1->priv_data; VideoData *s = s1->priv_data;
AVStream *st; AVStream *st;
int video_fd, frame_size; int video_fd;
int desired_palette, desired_depth; int desired_palette, desired_depth;
struct video_tuner tuner; struct video_tuner tuner;
struct video_audio audio; struct video_audio audio;
@ -230,7 +230,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
for (j = 0; j < vformat_num; j++) { for (j = 0; j < vformat_num; j++) {
if (s->frame_format == video_formats[j].palette) { if (s->frame_format == video_formats[j].palette) {
frame_size = s->video_win.width * s->video_win.height * video_formats[j].depth / 8; s->frame_size = s->video_win.width * s->video_win.height * video_formats[j].depth / 8;
st->codec->pix_fmt = video_formats[j].pix_fmt; st->codec->pix_fmt = video_formats[j].pix_fmt;
break; break;
} }
@ -240,14 +240,13 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
goto fail; goto fail;
s->fd = video_fd; s->fd = video_fd;
s->frame_size = frame_size;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->codec->width = s->video_win.width; st->codec->width = s->video_win.width;
st->codec->height = s->video_win.height; st->codec->height = s->video_win.height;
st->codec->time_base = s->time_base; st->codec->time_base = s->time_base;
st->codec->bit_rate = 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;
return 0; return 0;
fail: fail: