[vlc-commits] fourcc: move hvc1 mapping to fourcc

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Sep 14 13:35:01 2017 +0200| [c5da5268dd85029479c2c802641591519c4892b5] | committer: Francois Cartegnie

fourcc: move hvc1 mapping to fourcc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5da5268dd85029479c2c802641591519c4892b5
---

 modules/demux/mp4/essetup.c | 1 -
 src/misc/fourcc_list.h      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 8e53e204f4..1bdb350a4f 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -634,7 +634,6 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
                     memcpy( p_track->fmt.p_extra, p_hvcC->data.p_binary->p_blob,
                             p_hvcC->data.p_binary->i_blob );
                 }
-                p_track->fmt.i_codec = VLC_CODEC_HEVC;
             }
             else
             {
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 21f849aea2..f2bf070e09 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -231,6 +231,7 @@ static const staticentry_t p_list_video[] = {
         A("H265"),
         A("x265"),
         A("hev1"),
+        A("hvc1"),
         A("HM10"),
 
     /* h264 */