aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-17 04:43:22 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-10-17 04:43:22 +0200
commit675258764dce6f9f4a6f5fb58c87731714fb964a (patch)
tree635a552f10d89382bcc2e890dec47e61eec33a49
parent6109c10b81d6bc484996e3407046302d3a537575 (diff)
downloadffmpeg-675258764dce6f9f4a6f5fb58c87731714fb964a.tar.gz
Update for 3.1.5
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--Changelog11
-rw-r--r--RELEASE2
-rw-r--r--doc/Doxyfile2
3 files changed, 12 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 4f2db19190..de4b50fb37 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,16 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
-version <next>:
+version 3.1.5:
+- doc: fix various typos and grammar errors
+- avformat/utils: Update codec_id before using it in the parser init
+- cmdutils: fix typos
+- lavfi: fix typos
+- lavc: fix typos
+- tools: fix grammar error
+- ffmpeg: remove unused and errorneous AVFrame timestamp check
+- Support for MIPS cpu P6600
+- avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
version 3.1.4:
- avformat/avidec: Check nb_streams in read_gab2_sub()
diff --git a/RELEASE b/RELEASE
index 0aec50e6ed..3ad0595adc 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.1.4
+3.1.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 000498bc17..8fa0819b72 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 3.1.4
+PROJECT_NUMBER = 3.1.5
# With the PROJECT_LOGO tag one can specify a logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55