diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 13:11:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 13:11:11 +0200 |
| commit | 43c157f4a46cb76739f07782d23d1e4ff8da3253 (patch) | |
| tree | f74dfcbb6a16498524fa2185ac3160cd224b5c04 /libavformat | |
| parent | d7a473926504e2acfa6ae3bead0938e1f4e03441 (diff) | |
| parent | 7b556be6735371d1040c7076547b8198d9fadd34 (diff) | |
| download | ffmpeg-43c157f4a46cb76739f07782d23d1e4ff8da3253.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_resample: avoid conversion of identical sample formats for 1 channel
avcodec: allow either planar or interleaved sample format when encoding mono
adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order
timefilter: De-doxygenize normal code comments and drop silly ones
gxf: Include the right header for the avpriv_frame_rate_tab declaration
Conflicts:
libavcodec/adpcmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/gxf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 9f000d0d16..c63cafb598 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -23,6 +23,7 @@ #include "avformat.h" #include "internal.h" #include "gxf.h" +#include "libavcodec/mpeg12data.h" struct gxf_stream_info { int64_t first_field; @@ -207,7 +208,6 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info * @return fps as AVRational, or 0 / 0 if unknown */ static AVRational fps_tag2avr(int32_t fps) { - extern const AVRational avpriv_frame_rate_tab[]; if (fps < 1 || fps > 9) fps = 9; return avpriv_frame_rate_tab[9 - fps]; // values have opposite order } |