Merging upstream version 0.38.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 3 deletions

diff --git a/demux/stheader.h b/demux/stheader.h
index 1bc036d..4f33bbc 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -49,7 +49,7 @@ struct sh_stream {
     bool visual_impaired_track; // container flag
     bool hearing_impaired_track;// container flag
     bool image;                 // video stream is an image
-    bool still_image;           // video stream contains still images
+    bool still_image;           // video consists of multiple sparse still images
     int hls_bitrate;
     int program_id;
 
@@ -72,6 +72,12 @@ struct mp_codec_params {
     // E.g. "h264" (usually corresponds to AVCodecDescriptor.name)
     const char *codec;
 
+    // Usually corresponds to AVCodecDescriptor.long_name
+    const char *codec_desc;
+
+    // Corresponding codec profile
+    const char *codec_profile;
+
     // Usually a FourCC, exact meaning depends on codec.
     unsigned int codec_tag;
 
@@ -105,11 +111,13 @@ struct mp_codec_params {
     int disp_w, disp_h;   // display size
     int rotate;           // intended display rotation, in degrees, [0, 359]
     int stereo_mode;      // mp_stereo3d_mode (0 if none/unknown)
-    struct mp_colorspace color; // colorspace info where available
-    struct mp_rect crop;        // crop to be applied
+    struct pl_color_space color; // colorspace info where available
+    struct pl_color_repr repr;   // color representaion info where available
+    struct mp_rect crop;         // crop to be applied
 
     // STREAM_VIDEO + STREAM_AUDIO
     int bits_per_coded_sample;
+    char *format_name;    // pixel format (video) or sample format (audio)
 
     // STREAM_SUB
     double frame_based;   // timestamps are frame-based (and this is the