[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avformat.h,1.122,1.123

Michael Niedermayer CVS michael
Fri Jun 24 13:38:25 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv141

Modified Files:
	avformat.h 
Log Message:
AVStream.nb_frames and docs for r_frame_rate


Index: avformat.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- avformat.h	18 Jun 2005 01:52:24 -0000	1.122
+++ avformat.h	24 Jun 2005 11:38:22 -0000	1.123
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#define LIBAVFORMAT_BUILD       4627
+#define LIBAVFORMAT_BUILD       4628
 
 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
 #define LIBAVFORMAT_VERSION     FFMPEG_VERSION
@@ -225,7 +225,12 @@
     int index;    /* stream index in AVFormatContext */
     int id;       /* format specific stream id */
     AVCodecContext codec; /* codec context */
-    AVRational r_frame_rate;     /* real frame rate of the stream */
+    /**
+     * real base frame rate of the stream.
+     * for example if the timebase is 1/90000 and all frames have either 
+     * approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1
+     */
+    AVRational r_frame_rate;
     void *priv_data;
     /* internal data used in av_find_stream_info() */
     int64_t codec_info_duration;     
@@ -262,6 +267,8 @@
                                     support seeking natively */
     int nb_index_entries;
     int index_entries_allocated_size;
+    
+    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
 } AVStream;
 
 #define AVFMTCTX_NOHEADER      0x0001 /* signal that no header is present





More information about the ffmpeg-cvslog mailing list