diff options
| author | wm4 <wm4@nowhere> | 2016-01-12 23:48:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-12 23:48:19 +0100 |
| commit | 671df54e4dcf0675c335483d26f7f6ff9baaf76a (patch) | |
| tree | 6a206ddf489474150fffa2eac651b5e8915b969c /demux/codec_tags.h | |
| parent | 81f3b3aafe72e5ca9ac79d29246e70dce76ebca9 (diff) | |
| download | mpv-671df54e4dcf0675c335483d26f7f6ff9baaf76a.tar.bz2 mpv-671df54e4dcf0675c335483d26f7f6ff9baaf76a.tar.xz | |
demux: merge sh_video/sh_audio/sh_sub
This is mainly a refactor. I'm hoping it will make some things easier
in the future due to cleanly separating codec metadata and stream
metadata.
Also, declare that the "codec" field can not be NULL anymore. demux.c
will set it to "" if it's NULL when added. This gets rid of a corner
case everything had to handle, but which rarely happened.
Diffstat (limited to 'demux/codec_tags.h')
| -rw-r--r-- | demux/codec_tags.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/demux/codec_tags.h b/demux/codec_tags.h index 3489f0da5c..294759a299 100644 --- a/demux/codec_tags.h +++ b/demux/codec_tags.h @@ -21,12 +21,12 @@ #include <stdint.h> #include <stdbool.h> -struct sh_stream; +struct mp_codec_params; -void mp_set_codec_from_tag(struct sh_stream *sh); +void mp_set_codec_from_tag(struct mp_codec_params *c); -void mp_set_pcm_codec(struct sh_stream *sh, bool sign, bool is_float, int bits, - bool is_be); +void mp_set_pcm_codec(struct mp_codec_params *c, bool sign, bool is_float, + int bits, bool is_be); const char *mp_map_mimetype_to_video_codec(const char *mimetype); |