[FFmpeg-cvslog] lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL

Stefano Sabatini git at videolan.org
Fri Jul 5 01:05:09 CEST 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jul  4 19:30:21 2013 +0200| [41fe750f4b130f08f41ce0e5126046315c891cae] | committer: Stefano Sabatini

lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41fe750f4b130f08f41ce0e5126046315c891cae
---

 libavcodec/bitstream_filter.c |    2 ++
 libavcodec/version.h          |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c
index dd10531..e562555 100644
--- a/libavcodec/bitstream_filter.c
+++ b/libavcodec/bitstream_filter.c
@@ -53,6 +53,8 @@ AVBitStreamFilterContext *av_bitstream_filter_init(const char *name){
 }
 
 void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc){
+    if (!bsfc)
+        return;
     if(bsfc->filter->close)
         bsfc->filter->close(bsfc);
     av_freep(&bsfc->priv_data);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b9a2bc4..f6e2d71 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR  18
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list