aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-10-08 22:01:19 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-08 22:01:19 +0000
commitfd0368e7ca35e2feaf7960564e61a76655c4d1f6 (patch)
tree0dc1e28a21af61d68754709a8c421269919a5a58 /libavformat/avformat.h
parentf47d172f13f97edd8300403f370d11f29274f11c (diff)
downloadffmpeg-fd0368e7ca35e2feaf7960564e61a76655c4d1f6.tar.gz
move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b08f758d0f..a5c745bb78 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -617,6 +617,18 @@ typedef struct AVStream {
* Number of frames that have been demuxed during av_find_stream_info()
*/
int codec_info_nb_frames;
+
+ /**
+ * Stream informations used internally by av_find_stream_info()
+ */
+#define MAX_STD_TIMEBASES (60*12+5)
+ struct {
+ int64_t last_dts;
+ int64_t duration_gcd;
+ int duration_count;
+ double duration_error[MAX_STD_TIMEBASES];
+ int64_t codec_info_duration;
+ } *info;
} AVStream;
#define AV_PROGRAM_RUNNING 1