github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

AVVideoFrame -> AVFrame

Browse Source 
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-12-09 12:03:43 +00:00
parent f694168d52
commit 492cd3a920
23 changed files with 120 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/asf.c
View File

@@ -556,7 +556,7 @@ static void put_frame_header(AVFormatContext *s, ASFStream *stream, int timestam
int val;
val = stream->num;
if (s->streams[val - 1]->codec.coded_picture->key_frame /* && frag_offset == 0 */)
if (s->streams[val - 1]->codec.coded_frame->key_frame /* && frag_offset == 0 */)
val |= 0x80;
put_byte(pb, val);
put_byte(pb, stream->seq);

2
libavformat/avienc.c
View File

@@ -320,7 +320,7 @@ static int avi_write_packet(AVFormatContext *s, int stream_index,
if (enc->codec_type == CODEC_TYPE_VIDEO) {
tag[2] = 'd';
tag[3] = 'c';
flags = enc->coded_picture->key_frame ? 0x10 : 0x00;
flags = enc->coded_frame->key_frame ? 0x10 : 0x00;
} else {
tag[2] = 'w';
tag[3] = 'b';

2
libavformat/ffm.c
View File

@@ -232,7 +232,7 @@ static int ffm_write_packet(AVFormatContext *s, int stream_index,
/* packet size & key_frame */
header[0] = stream_index;
header[1] = 0;
if (st->codec.coded_picture && st->codec.coded_picture->key_frame)
if (st->codec.coded_frame->key_frame) //if st->codec.coded_frame==NULL then there is a bug somewhere else
header[1] |= FLAG_KEY_FRAME;
header[2] = (size >> 16) & 0xff;
header[3] = (size >> 8) & 0xff;

4
libavformat/rm.c
View File

@@ -333,7 +333,7 @@ static int rm_write_audio(AVFormatContext *s, UINT8 *buf, int size)
/* XXX: suppress this malloc */
buf1= (UINT8*) av_malloc( size * sizeof(UINT8) );
write_packet_header(s, stream, size, stream->enc->key_frame);
write_packet_header(s, stream, size, stream->enc->coded_frame->key_frame);
/* for AC3, the words seems to be reversed */
for(i=0;i<size;i+=2) {
@@ -352,7 +352,7 @@ static int rm_write_video(AVFormatContext *s, UINT8 *buf, int size)
RMContext *rm = s->priv_data;
ByteIOContext *pb = &s->pb;
StreamInfo *stream = rm->video_stream;
int key_frame = stream->enc->coded_picture->key_frame;
int key_frame = stream->enc->coded_frame->key_frame;
/* XXX: this is incorrect: should be a parameter */

2
libavformat/utils.c
View File

@@ -458,7 +458,7 @@ int av_find_stream_info(AVFormatContext *ic)
AVCodec *codec;
AVStream *st;
AVPacket *pkt;
AVVideoFrame picture;
AVFrame picture;
AVPacketList *pktl=NULL, **ppktl;
short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
UINT8 *ptr;