[vlc-commits] mux: mp4: warn when muxing annexb h264

Francois Cartegnie git at videolan.org
Thu Aug 4 20:22:50 CEST 2016


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

mux: mp4: warn when muxing annexb h264

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

 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 5e3e174..e9bd86c 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -413,12 +413,15 @@ static int AddStream(sout_mux_t *p_mux, sout_input_t *p_input)
     case VLC_CODEC_SVQ1:
     case VLC_CODEC_SVQ3:
     case VLC_CODEC_H263:
-    case VLC_CODEC_H264:
     case VLC_CODEC_AMR_NB:
     case VLC_CODEC_AMR_WB:
     case VLC_CODEC_YV12:
     case VLC_CODEC_YUYV:
         break;
+    case VLC_CODEC_H264:
+        if(!p_input->p_fmt->i_extra)
+            msg_Warn(p_mux, "H264 muxing from AnnexB source will set an incorrect default profile");
+        break;
     case VLC_CODEC_HEVC:
         if(!p_input->p_fmt->i_extra)
             msg_Err(p_mux, "HEVC muxing from AnnexB source is unsupported");



More information about the vlc-commits mailing list