summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-27 22:08:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-29 17:40:28 +0100
commitef7b6b489ab38a8f0abe6b8f55c0e130cbd125c9 (patch)
treeb3a0892c9a4d1bf7406a22379144861b8fc5d34e /libavformat/avformat.h
parentc81d2fa96ddc9f6dab38d61a8803caca7e63bea0 (diff)
ffmpeg/avformat: factor av_guess_frame_rate() out
This will be used in ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 549a0fa45f..57603031a4 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2108,6 +2108,16 @@ const struct AVCodecTag *avformat_get_riff_audio_tags(void);
AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
/**
+ * Guess the frame rate, based on both the container and codec information.
+ *
+ * @param ctx the format context which the stream is part of
+ * @param stream the stream which the frame is part of
+ * @param frame the frame for which the frame rate should be determined, may be NULL
+ * @return the guessed (valid) frame rate, 0/1 if no idea
+ */
+AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame);
+
+/**
* Check if the stream st contained in s is matched by the stream specifier
* spec.
*