Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor compilation fix

Browse Source 
A few files are not in sync with the change of AVStream's codec
member from inline struct to pointer.
patch by (Sam Hocevar: sam, zoy org)

Originally committed as revision 4505 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Sam Hocevar 20 years ago committed by Michael Niedermayer
parent dbbcfd6bc3
commit 9f747cc328
3 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavformat/beosaudio.cpp
  2. 16
      libavformat/dc1394.c
  3. 14
      libavformat/grab_bktr.c

12
libavformat/beosaudio.cpp
Unescape View File

@ -287,8 +287,8 @@ static int audio_write_header(AVFormatContext *s1)
int ret;
st = s1->streams[0];
s->sample_rate = st->codec.sample_rate;
s->channels = st->codec.channels;
s->sample_rate = st->codec->sample_rate;
s->channels = st->codec->channels;
ret = audio_open(s, 1, NULL);
if (ret < 0)
return -EIO;
@ -365,10 +365,10 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return -EIO;
}
/* take real parameters */
st->codec.codec_type = CODEC_TYPE_AUDIO;
st->codec.codec_id = s->codec_id;
st->codec.sample_rate = s->sample_rate;
st->codec.channels = s->channels;
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = s->codec_id;
st->codec->sample_rate = s->sample_rate;
st->codec->channels = s->channels;
return 0;
av_set_pts_info(s1, 48, 1, 1000000); /* 48 bits pts in us */
}

16
libavformat/dc1394.c
Unescape View File

@ -80,13 +80,13 @@ static int dc1394_read_header(AVFormatContext *c, AVFormatParameters * ap)
if (!vst)
return -1;
av_set_pts_info(vst, 64, 1, 1000);
vst->codec.codec_type = CODEC_TYPE_VIDEO;
vst->codec.codec_id = CODEC_ID_RAWVIDEO;
vst->codec.time_base.den = fps->frame_rate;
vst->codec.time_base.num = 1000;
vst->codec.width = fmt->width;
vst->codec.height = fmt->height;
vst->codec.pix_fmt = fmt->pix_fmt;
vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_RAWVIDEO;
vst->codec->time_base.den = fps->frame_rate;
vst->codec->time_base.num = 1000;
vst->codec->width = fmt->width;
vst->codec->height = fmt->height;
vst->codec->pix_fmt = fmt->pix_fmt;
/* packet init */
av_init_packet(&dc1394->packet);
@ -97,7 +97,7 @@ static int dc1394_read_header(AVFormatContext *c, AVFormatParameters * ap)
dc1394->current_frame = 0;
dc1394->fps = fps->frame_rate;
vst->codec.bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
vst->codec->bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000);
/* Now lets prep the hardware */
dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */

14
libavformat/grab_bktr.c
Unescape View File

@ -268,13 +268,13 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->frame_rate_base = frame_rate_base;
s->per_frame = ((u_int64_t)1000000 * s->frame_rate_base) / s->frame_rate;
st->codec.codec_type = CODEC_TYPE_VIDEO;
st->codec.pix_fmt = PIX_FMT_YUV420P;
st->codec.codec_id = CODEC_ID_RAWVIDEO;
st->codec.width = width;
st->codec.height = height;
st->codec.time_base.den = frame_rate;
st->codec.time_base.num = frame_rate_base;
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->pix_fmt = PIX_FMT_YUV420P;
st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->codec->width = width;
st->codec->height = height;
st->codec->time_base.den = frame_rate;
st->codec->time_base.num = frame_rate_base;
if (ap->standard) {
if (!strcasecmp(ap->standard, "pal"))

Write Preview
Loading…
Cancel
Save