summaryrefslogtreecommitdiffstats
path: root/ffmpeg_files/taglists.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-22 01:52:09 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-26 06:15:30 +0300
commita009d56d4d9672e88660bc7e1d179bbbdfb7b35a (patch)
tree3852711d9077c630e9090b7eb0215cbd352aee81 /ffmpeg_files/taglists.h
parent97bd0624df0e2f7acaca708258eb7627fabf6d02 (diff)
downloadmpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.bz2
mpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.xz
Add copies of needed internal FFmpeg files under ffmpeg_files/
MPlayer used to depend on having an FFmpeg tree available at build time to provide this code, and FFmpeg changes occasionally broke the MPlayer build as a result. Some of the relevant functionality also depends on FFmpeg library symbols that are not part of the FFmpeg API, meaning that library changes could break MPlayer after the build. Add a copy of the relevant functionality to the MPlayer tree and use that instead. The added files are: - The headers bswap.h, intreadwrite.h and x86_cpu.h from libavutil. Some MPlayer code uses the functionality defined as macros and static inline functions in these headers. - Architecture-specific internal files used by the above headers. These are in the subdirectories: x86/, arm/, bfin/, sh4/. - taglists.[ch], which provides the codec tables from libavformat/riff.c and two functions to access them from libavformat/utils.c. Most of the headers are copied from FFmpeg revision 19452 with only the include guard names changed. A "common.h" include in bswap.h was changed to "libavutil/common.h" as it should use the installed header. Taglists.c contains snippets from the relevant files with some changes like renamed identifiers.
Diffstat (limited to 'ffmpeg_files/taglists.h')
-rw-r--r--ffmpeg_files/taglists.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/ffmpeg_files/taglists.h b/ffmpeg_files/taglists.h
new file mode 100644
index 0000000000..4c8f9bfdbd
--- /dev/null
+++ b/ffmpeg_files/taglists.h
@@ -0,0 +1,9 @@
+#include "libavcodec/avcodec.h"
+
+struct mp_AVCodecTag {
+ int id;
+ unsigned int tag;
+};
+
+unsigned int mp_av_codec_get_tag(const struct mp_AVCodecTag * const *tags, enum CodecID id);
+enum CodecID mp_av_codec_get_id(const struct mp_AVCodecTag * const *tags, unsigned int tag);