diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
tree | e1c4465768635d77954b5fd21ae726444ee4f48a /libmpdemux/mp_taglists.h | |
parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'libmpdemux/mp_taglists.h')
-rw-r--r-- | libmpdemux/mp_taglists.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libmpdemux/mp_taglists.h b/libmpdemux/mp_taglists.h index 381b77a8db..d23a982a93 100644 --- a/libmpdemux/mp_taglists.h +++ b/libmpdemux/mp_taglists.h @@ -21,12 +21,8 @@ #include <libavcodec/avcodec.h> -#include "ffmpeg_files/taglists.h" - -extern const struct mp_AVCodecTag * const mp_wav_taglists[]; - -extern const struct mp_AVCodecTag * const mp_codecid_override_taglists[]; - -extern const struct mp_AVCodecTag * const mp_bmp_taglists[]; +unsigned int mp_taglist_override(enum CodecID id); +unsigned int mp_taglist_video(enum CodecID id); +unsigned int mp_taglist_audio(enum CodecID id); #endif /* MPLAYER_MP_TAGLISTS_H */ |