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 /libavcodec/dirac.c | |
| parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
| parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
| download | ffmpeg-streaming-b0554fec0470bf59b0582c80697d28646e37b854.zip ffmpeg-streaming-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 'libavcodec/dirac.c')
| -rw-r--r-- | libavcodec/dirac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index 79638ac..4fcb3a2 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -164,7 +164,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, /* [DIRAC_STD] preset_frame_rate(video_params, index) */ if (source->frame_rate_index > 0) { if (source->frame_rate_index <= 8) - frame_rate = avpriv_frame_rate_tab[source->frame_rate_index]; /* [DIRAC_STD] Table 10.3 values 1-8 */ + frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index]; else /* [DIRAC_STD] Table 10.3 values 9-10 */ frame_rate = dirac_frame_rate[source->frame_rate_index-9]; |
