ffmpeg | branch: release/3.1 | Michael Niedermayer <mich...@niedermayer.cc> | 
Mon Oct 17 04:43:22 2016 +0200| [675258764dce6f9f4a6f5fb58c87731714fb964a] | 
committer: Michael Niedermayer

Update for 3.1.5

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

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

 Changelog    | 11 ++++++++++-
 RELEASE      |  2 +-
 doc/Doxyfile |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 4f2db19..de4b50f 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 0aec50e..3ad0595 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.1.4
+3.1.5
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 000498b..8fa0819 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

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to