Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / bitstream_filter.c

diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c
index 1a6ba396d2e794b42fdd696216a34063a582fe5e..7d5c9c52ffb5bddfb0d345d24d15cc4c03ed55ee 100644 (file)
--- a/libavcodec/bitstream_filter.c
+++ b/libavcodec/bitstream_filter.c
@@ -39,7 +39,7 @@ AVBitStreamFilterContext *av_bitstream_filter_init(const char *name){
         if(!strcmp(name, bsf->name)){
             AVBitStreamFilterContext *bsfc= av_mallocz(sizeof(AVBitStreamFilterContext));
             bsfc->filter= bsf;
-            bsfc->priv_data= av_mallocz(bsf->priv_data_size);
+            bsfc->priv_data = bsf->priv_data_size ? av_mallocz(bsf->priv_data_size) : NULL;
             return bsfc;
         }
         bsf= bsf->next;