diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 00:56:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 00:56:33 +0200 |
| commit | 7d1918affee4bc70fb8ac139ba9235e7fed2979b (patch) | |
| tree | b8c1beadf98aceeee6a155ae83bfc110656ca595 /libavformat/version.h | |
| parent | 316f6df9cc5a70c5b117793c9f167c4ce629c1e0 (diff) | |
| parent | 41f43202cf7648522b4ce0ed7bbb326655dbb9bc (diff) | |
| download | ffmpeg-7d1918affee4bc70fb8ac139ba9235e7fed2979b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvdec: remove spurious use of stream id
lavf: deprecate r_frame_rate.
lavf: round estimated average fps to a "standard" fps.
Conflicts:
ffmpeg.c
ffprobe.c
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/flvdec.c
libavformat/rawdec.c
libavformat/utils.c
tests/ref/fate/iv8-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index d7841f743c..faf068ff39 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -82,5 +82,8 @@ #ifndef FF_API_AV_GETTIME #define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55) #endif +#ifndef FF_API_R_FRAME_RATE +#define FF_API_R_FRAME_RATE (LIBAVFORMAT_VERSION_MAJOR < 55) +#endif #endif /* AVFORMAT_VERSION_H */ |