diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
| commit | b0554fec0470bf59b0582c80697d28646e37b854 (patch) | |
| tree | 1f111a02df3a1e29f29ed963fb32ccfa72f2cce1 /libavformat | |
| parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
| parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
| download | ffmpeg-b0554fec0470bf59b0582c80697d28646e37b854.tar.gz | |
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aviobuf.c | 2 | ||||
| -rw-r--r-- | libavformat/gxf.c | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 6e060ba27c..81f4b594d5 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -228,12 +228,10 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) } else { int64_t res; -#if CONFIG_MUXERS || CONFIG_NETWORK if (s->write_flag) { flush_buffer(s); s->must_flush = 1; } -#endif /* CONFIG_MUXERS || CONFIG_NETWORK */ if (!s->seek) return AVERROR(EPIPE); if ((res = s->seek(s->opaque, offset, SEEK_SET)) < 0) diff --git a/libavformat/gxf.c b/libavformat/gxf.c index c63cafb598..0286439c44 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -202,6 +202,18 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info } } +static const AVRational frame_rate_tab[] = { + { 60, 1}, + {60000, 1001}, + { 50, 1}, + { 30, 1}, + {30000, 1001}, + { 25, 1}, + { 24, 1}, + {24000, 1001}, + { 0, 0}, +}; + /** * @brief convert fps tag value to AVRational fps * @param fps fps value from tag @@ -209,7 +221,7 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info */ static AVRational fps_tag2avr(int32_t fps) { if (fps < 1 || fps > 9) fps = 9; - return avpriv_frame_rate_tab[9 - fps]; // values have opposite order + return frame_rate_tab[fps - 1]; } /** |