summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-07-04 19:30:21 +0200
committerStefano Sabatini <stefasab@gmail.com>2013-07-05 00:58:03 +0200
commit41fe750f4b130f08f41ce0e5126046315c891cae (patch)
tree2b35c005fe2f95b8835aa9a426a9d4fe009185c4 /libavcodec
parent46ad287a2a87554bb10dff437dfad7edcd38bb69 (diff)
lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/bitstream_filter.c2
-rw-r--r--libavcodec/version.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c
index dd105316ee..e562555f01 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 b9a2bc4b0d..f6e2d71c9f 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, \