diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 01:07:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 01:07:11 +0100 |
| commit | 1e19927f12a2a65954aabf38b584025beff15cc3 (patch) | |
| tree | 33c88297cb164490ebe38b67cf353029d9fb83f2 /libavformat/avi.h | |
| parent | ca55606a5127a9ddb10e4c1971c56e3e69bfd864 (diff) | |
| parent | 1f948745c3cbe45c4ccd5d8996fc885d826bf3ff (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: use an enum for Frame Coding Mode
doc: cleanup filter section
indeo3: error out if no motion vector is set.
x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
mpegaudio: do not use init_static_data() for initializing tables.
musepack: fix signed shift overflow in mpc_read_packet()
mov: Make format string match variable type.
wmavoice: Make format string match variable type.
vc1: select interlaced scan table by FCM element
Generalize RIFF INFO tag support; support reading INFO tag in wav
pthread: track thread existence in a separate variable.
Conflicts:
doc/filters.texi
libavcodec/pthread.c
libavformat/avi.c
libavformat/riff.c
libavformat/riff.h
libavformat/wav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avi.h')
| -rw-r--r-- | libavformat/avi.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/avi.h b/libavformat/avi.h index b4e551971a..34da76f715 100644 --- a/libavformat/avi.h +++ b/libavformat/avi.h @@ -21,8 +21,6 @@ #ifndef AVFORMAT_AVI_H #define AVFORMAT_AVI_H -#include "metadata.h" - #define AVIF_HASINDEX 0x00000010 // Index at end of file? #define AVIF_MUSTUSEINDEX 0x00000020 #define AVIF_ISINTERLEAVED 0x00000100 @@ -37,11 +35,4 @@ /* index flags */ #define AVIIF_INDEX 0x10 -extern const AVMetadataConv ff_avi_metadata_conv[]; - -/** - * A list of AVI info tags. - */ -extern const char ff_avi_tags[][5]; - #endif /* AVFORMAT_AVI_H */ |