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 /ffmpeg_files/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 'ffmpeg_files/taglists.h')
| -rw-r--r-- | ffmpeg_files/taglists.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ffmpeg_files/taglists.h b/ffmpeg_files/taglists.h deleted file mode 100644 index 4c8f9bfdbd..0000000000 --- a/ffmpeg_files/taglists.h +++ /dev/null @@ -1,9 +0,0 @@ -#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); |