summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-23 08:20:12 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-11 18:23:50 +0100
commit85a5bc054c1290699ccbf5799ba6c4e2fbcc3530 (patch)
tree63f34e340221524d630668a3040b874a01e40212 /libavformat/avformat.h
parent7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff)
lavf: remove disabled FF_API_R_FRAME_RATE cruft
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 08d2f3a876..067a7874b9 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -632,17 +632,6 @@ typedef struct AVStream {
* not actually used for encoding.
*/
AVCodecContext *codec;
-#if FF_API_R_FRAME_RATE
- /**
- * Real base framerate of the stream.
- * This is the lowest framerate with which all timestamps can be
- * represented accurately (it is the least common multiple of all
- * framerates in the stream). Note, this value is just a guess!
- * For example, if the time base 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;
-#endif
void *priv_data;
/**
@@ -718,12 +707,6 @@ typedef struct AVStream {
*/
#define MAX_STD_TIMEBASES (60*12+5)
struct {
-#if FF_API_R_FRAME_RATE
- int64_t last_dts;
- int64_t duration_gcd;
- int duration_count;
- double duration_error[MAX_STD_TIMEBASES];
-#endif
int nb_decoded_frames;
int found_decoder;