[vlc-commits] mux: mp4: reject HEVC without extradata

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Aug  4 20:14:38 2016 +0200| [c33c2eecd2af64804e72b4e9332e7d1fd03ebac9] | committer: Francois Cartegnie

mux: mp4: reject HEVC without extradata

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

 modules/mux/mp4/mp4.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c
index e0e29b1..5e3e174 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -414,12 +414,15 @@ static int AddStream(sout_mux_t *p_mux, sout_input_t *p_input)
     case VLC_CODEC_SVQ3:
     case VLC_CODEC_H263:
     case VLC_CODEC_H264:
-    case VLC_CODEC_HEVC:
     case VLC_CODEC_AMR_NB:
     case VLC_CODEC_AMR_WB:
     case VLC_CODEC_YV12:
     case VLC_CODEC_YUYV:
         break;
+    case VLC_CODEC_HEVC:
+        if(!p_input->p_fmt->i_extra)
+            msg_Err(p_mux, "HEVC muxing from AnnexB source is unsupported");
+        return VLC_EGENERIC;
     case VLC_CODEC_SUBT:
         msg_Warn(p_mux, "subtitle track added like in .mov (even when creating .mp4)");
         break;