diff options
Diffstat (limited to 'demux/stheader.h')
| -rw-r--r-- | demux/stheader.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 97d079f4e6..433b2a934a 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -21,6 +21,8 @@ #include <stdbool.h> +#include "codec_tags.h" + #include "aviheader.h" #include "ms_hdr.h" struct MPOpts; @@ -54,6 +56,9 @@ struct sh_stream { struct sh_video *video; struct sh_sub *sub; + // E.g. "h264" (usually corresponds to AVCodecDescriptor.name) + const char *codec; + // Work around other hacks. int lavf_codec_tag; @@ -61,6 +66,9 @@ struct sh_stream { bool default_track; // container default track flag bool attached_picture; // stream is a picture (such as album art) + // Human readable description of the running decoder, or NULL + char *decoder_desc; + // shouldn't exist type of stuff struct MPOpts *opts; }; @@ -68,12 +76,10 @@ struct sh_stream { #define SH_COMMON \ struct sh_stream *gsh; \ - const char *demuxer_codecname; \ struct MPOpts *opts; \ struct demux_stream *ds; \ - struct codecs *codec; \ + /* usually a FourCC, exact meaning depends on gsh->format */ \ unsigned int format; \ - int libav_codec_id; \ int initialized; \ /* number of seconds stream should be delayed \ * (according to dwStart or similar) */ \ @@ -87,7 +93,6 @@ struct sh_stream { double pts; \ /* decoder context */ \ void *context; \ - const char *codecname; \ char *lang; /* track language */ \ typedef struct sh_common { @@ -154,7 +159,6 @@ typedef struct sh_video { int disp_w, disp_h; // display size (filled by demuxer) int colorspace; // mp_csp int color_range; // mp_csp_levels - int imgfmt; // raw video image format // output driver/filters: (set by libmpcodecs core) unsigned int outfmt; struct vf_instance *vfilter; // video filter chain |