AVVideoFrame -> AVFrame

Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 6 insertions, 6 deletions

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 3635913713..9c327133b2 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -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);
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index a9bf3a8d92..f14b1cb274 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -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';
diff --git a/libavformat/ffm.c b/libavformat/ffm.c
index 2f247e422e..3df2d5e736 100644
--- a/libavformat/ffm.c
+++ b/libavformat/ffm.c
@@ -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;
diff --git a/libavformat/rm.c b/libavformat/rm.c
index 44e384559d..72bd6978c1 100644
--- a/libavformat/rm.c
+++ b/libavformat/rm.c
@@ -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 */
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3388ddc9ef..239b14eb55 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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;