git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lavf: remove disabled FF_API_R_FRAME_RATE cruft
[ffmpeg.git]
/
libavformat
/
mov.c
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
7fe0548
..
45587cd
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-2061,12
+2061,6
@@
static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (st->duration != AV_NOPTS_VALUE)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
sc->time_scale*st->nb_frames, st->duration, INT_MAX);
if (st->duration != AV_NOPTS_VALUE)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
sc->time_scale*st->nb_frames, st->duration, INT_MAX);
-
-#if FF_API_R_FRAME_RATE
- if (sc->stts_count == 1 || (sc->stts_count == 2 && sc->stts_data[1].count == 1))
- av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den,
- sc->time_scale, sc->stts_data[0].duration, INT_MAX);
-#endif
}
switch (st->codec->codec_id) {
}
switch (st->codec->codec_id) {