Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'

* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/avcodec.h
index 8774718abbd895386a84ec4c1913f845125291b9,7a5f10f1c9833ed793e288294afa2fc48ecca35c..ea3cb4506b1c0294e007e1cbf9d849cded9d28dd
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -410,36 -389,9 +410,37 @@@ enum AVCodecID 
      AV_CODEC_ID_DXV,
      AV_CODEC_ID_SCREENPRESSO,
      AV_CODEC_ID_RSCC,
 -    AV_CODEC_ID_MAGICYUV,
 +
 +    AV_CODEC_ID_Y41P = 0x8000,
 +    AV_CODEC_ID_AVRP,
 +    AV_CODEC_ID_012V,
 +    AV_CODEC_ID_AVUI,
 +    AV_CODEC_ID_AYUV,
 +    AV_CODEC_ID_TARGA_Y216,
 +    AV_CODEC_ID_V308,
 +    AV_CODEC_ID_V408,
 +    AV_CODEC_ID_YUV4,
 +    AV_CODEC_ID_AVRN,
 +    AV_CODEC_ID_CPIA,
 +    AV_CODEC_ID_XFACE,
 +    AV_CODEC_ID_SNOW,
 +    AV_CODEC_ID_SMVJPEG,
 +    AV_CODEC_ID_APNG,
 +    AV_CODEC_ID_DAALA,
 +    AV_CODEC_ID_CFHD,
      AV_CODEC_ID_TRUEMOTION2RT,
 +    AV_CODEC_ID_M101,
 +    AV_CODEC_ID_MAGICYUV,
 +    AV_CODEC_ID_SHEERVIDEO,
 +    AV_CODEC_ID_YLC,
 +    AV_CODEC_ID_PSD,
 +    AV_CODEC_ID_PIXLET,
 +    AV_CODEC_ID_SPEEDHQ,
 +    AV_CODEC_ID_FMVC,
 +    AV_CODEC_ID_SCPR,
 +    AV_CODEC_ID_CLEARVIDEO,
 +    AV_CODEC_ID_XPM,
+     AV_CODEC_ID_AV1,
  
      /* various PCM "codecs" */
      AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

diff --cc libavcodec/codec_desc.c
index c0418e4880f573ed65e2949c4336a665649c1932,18568c96227f055873f223563a70c4aae98b445b..4e98cf954903b19a8ca77e510288d78ff9b034da
--- 1/libavcodec/codec_desc.c
--- 2/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@@ -1325,55 -1205,13 +1325,62 @@@ static const AVCodecDescriptor codec_de
          .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"),
          .props     = AV_CODEC_PROP_LOSSY,
      },
 +    {
 +        .id        = AV_CODEC_ID_CFHD,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "cfhd",
 +        .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"),
 +        .props     = AV_CODEC_PROP_LOSSY,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_SHEERVIDEO,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "sheervideo",
 +        .long_name = NULL_IF_CONFIG_SMALL("BitJazz SheerVideo"),
 +        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_YLC,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "ylc",
 +        .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),
 +        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_PIXLET,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "pixlet",
 +        .long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"),
 +        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_FMVC,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "fmvc",
 +        .long_name = NULL_IF_CONFIG_SMALL("FM Screen Capture Codec"),
 +        .props     = AV_CODEC_PROP_LOSSLESS,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_SCPR,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "scpr",
 +        .long_name = NULL_IF_CONFIG_SMALL("ScreenPressor"),
 +        .props     = AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_LOSSY,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_CLEARVIDEO,
 +        .type      = AVMEDIA_TYPE_VIDEO,
 +        .name      = "clearvideo",
 +        .long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"),
 +        .props     = AV_CODEC_PROP_LOSSY,
 +    },
+     {
+         .id        = AV_CODEC_ID_AV1,
+         .type      = AVMEDIA_TYPE_VIDEO,
+         .name      = "av1",
+         .long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"),
+         .props     = AV_CODEC_PROP_LOSSY,
+     },
  
      /* image codecs */
      {

diff --cc libavformat/matroska.c
index 6af667c36b0069866f0878be912369543883b8d9,8842d7c4642e7b64b1dd9848d956be791871d43c..94ccbecedb5d57f0254b0121d0b3c6331ef2839f
--- 1/libavformat/matroska.c
--- 2/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@@ -75,10 -65,9 +75,11 @@@ const CodecTags ff_mkv_codec_tags[]=
      {"S_VOBSUB"         , AV_CODEC_ID_DVD_SUBTITLE},
      {"S_DVBSUB"         , AV_CODEC_ID_DVB_SUBTITLE},
      {"S_HDMV/PGS"       , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
 +    {"S_HDMV/TEXTST"    , AV_CODEC_ID_HDMV_TEXT_SUBTITLE},
  
+     {"V_AV1"            , AV_CODEC_ID_AV1},
      {"V_DIRAC"          , AV_CODEC_ID_DIRAC},
 +    {"V_FFV1"           , AV_CODEC_ID_FFV1},
      {"V_MJPEG"          , AV_CODEC_ID_MJPEG},
      {"V_MPEG1"          , AV_CODEC_ID_MPEG1VIDEO},
      {"V_MPEG2"          , AV_CODEC_ID_MPEG2VIDEO},

diff --cc libavformat/riff.c
index e3fb953622e9233cf7f07e0a31d0f652cad24cba,54bef835ba41c290e9be66c1a25b7735c7806435..2f2f53760aa09ce9c107d24e419cad6ec8e77b6d
--- 1/libavformat/riff.c
--- 2/libavformat/riff.c
+++ b/libavformat/riff.c
@@@ -424,34 -366,8 +424,34 @@@ const AVCodecTag ff_codec_bmp_tags[] = 
      { AV_CODEC_ID_SCREENPRESSO, MKTAG('S', 'P', 'V', '1') },
      { AV_CODEC_ID_RSCC,         MKTAG('R', 'S', 'C', 'C') },
      { AV_CODEC_ID_RSCC,         MKTAG('I', 'S', 'C', 'C') },
 +    { AV_CODEC_ID_CFHD,         MKTAG('C', 'F', 'H', 'D') },
 +    { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '1') },
 +    { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '2') },
      { AV_CODEC_ID_MAGICYUV,     MKTAG('M', 'A', 'G', 'Y') },
- 
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'R', 'G') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'R', 'A') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'G', '0') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'Y', '0') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'Y', '2') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'Y', '4') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '8', 'Y', 'A') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '0', 'R', 'A') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '0', 'R', 'G') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '0', 'G', '0') },
 +    { AV_CODEC_ID_MAGICYUV,     MKTAG('M', '0', 'Y', '2') },
 +    { AV_CODEC_ID_YLC,          MKTAG('Y', 'L', 'C', '0') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '0') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '1') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '2') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '3') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '4') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '5') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '7') },
 +    { AV_CODEC_ID_SPEEDHQ,      MKTAG('S', 'H', 'Q', '9') },
 +    { AV_CODEC_ID_FMVC,         MKTAG('F', 'M', 'V', 'C') },
 +    { AV_CODEC_ID_SCPR,         MKTAG('S', 'C', 'P', 'R') },
 +    { AV_CODEC_ID_CLEARVIDEO,   MKTAG('U', 'C', 'O', 'D') },
+     { AV_CODEC_ID_AV1,          MKTAG('A', 'V', '0', '1') },
      { AV_CODEC_ID_NONE,         0 }
  };