[vlc-commits] demux: mp4: play heif movies

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Mar 11 17:23:45 2018 +0100| [dcb6fa67165000929767861c91e864f94c8bc02c] | committer: Francois Cartegnie

demux: mp4: play heif movies

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

 modules/demux/mp4/libmp4.c | 1 +
 modules/demux/mp4/mp4.c    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 9906236489..ff9718a475 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -4690,6 +4690,7 @@ static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box )
             case ATOM_soun:
                 return MP4_ReadBox_sample_soun( p_stream, p_box );
             case ATOM_vide:
+            case ATOM_pict: /* heif */
                 return MP4_ReadBox_sample_vide( p_stream, p_box );
             case ATOM_hint:
                 return MP4_ReadBox_sample_hint8( p_stream, p_box );
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 41384a9818..7b6ca7b130 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3329,6 +3329,10 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
             es_format_Change( &p_track->fmt, AUDIO_ES, 0 );
             break;
 
+        case( ATOM_pict ): /* heif */
+            es_format_Change( &p_track->fmt, VIDEO_ES, 0 );
+            break;
+
         case( ATOM_vide ):
             if( !MP4_BoxGet( p_box_trak, "mdia/minf/vmhd") )
             {