aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-08 20:30:18 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-08 20:30:18 +0100
commitcbe65ccfa02a9061cead73a6685eef90225c41b5 (patch)
treec7d9e2aff14b16757dcba90dd293f67bbf6417c0
parent63637e457c4cc32b6e720206f48f6d354adda190 (diff)
downloadffmpeg-cbe65ccfa02a9061cead73a6685eef90225c41b5.tar.gz
Update for 3.2.4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--Changelog8
-rw-r--r--RELEASE2
-rw-r--r--doc/Doxyfile2
3 files changed, 10 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index b1f05a0348..1e0f861269 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,14 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
+version 3.2.4:
+- avcodec/h264_slice: Clear ref_counts on redundant slices
+- lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid
+- lavf/mov.c: Avoid heap allocation wrap in mov_read_hdlr
+- avcodec/pictordec: Fix logic error
+- ffserver_config: Setup codecpar in add_codec()
+- Changelog: fix typos
+
version 3.2.3:
- avcodec/movtextdec: Fix decode_styl() cleanup
- lavf/matroskadec: fix is_keyframe for early Blocks
diff --git a/RELEASE b/RELEASE
index b347b11eac..351227fca3 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.2.3
+3.2.4
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 367a2d04e5..14267723e3 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = FFmpeg
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.2.3
+PROJECT_NUMBER = 3.2.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a