vlc/vlc-3.0 | branch: master | Zhao Zhili <quinkbl...@foxmail.com> | Tue Jan 30 
09:56:07 2018 +0800| [799ed0a53b06f6a547ae497ff69e9d38efdd9208] | committer: 
Jean-Baptiste Kempf

demux: avformat: fix use NULL as string

long_name can be NULL if enable-small

Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
(cherry picked from commit 0c0db7b6a3d303f370f4775098a3a826d28125c1)
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>

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

 modules/demux/avformat/demux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 30d97434f0..14033c71f1 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -403,7 +403,7 @@ int avformat_OpenDemux( vlc_object_t *p_this )
                 es_fmt.i_original_fourcc = VLC_FOURCC('L','A','T','M');
                 es_fmt.b_packetized = false;
             }
-            else if(cp->codec_id == AV_CODEC_ID_AAC &&
+            else if(cp->codec_id == AV_CODEC_ID_AAC && p_sys->fmt->long_name &&
                     strstr(p_sys->fmt->long_name, "raw ADTS AAC"))
             {
                 es_fmt.i_original_fourcc = VLC_FOURCC('A','D','T','S');

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to