diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:50:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:50:01 +0200 |
| commit | 53b089200557b299174bec72415b166ad43083a6 (patch) | |
| tree | bfcb2f8ea991bdc2221e43c9e7488f8f991daaa4 | |
| parent | 69a68d301345a89a27479f2a6093fc4624804049 (diff) | |
| parent | d9792b773516a560ecb99694b8ee745a50027fac (diff) | |
| download | ffmpeg-53b089200557b299174bec72415b166ad43083a6.tar.gz | |
Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'
* commit 'd9792b773516a560ecb99694b8ee745a50027fac':
Mark 11 release in the changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5,13 +5,13 @@ version <next>: - Icecast protocol - ported lenscorrection filter from frei0r filter - large optimizations in dctdnoiz to make it usable -- request icecast metadata by default +- request Icecast metadata by default - support for using metadata in stream specifiers in fftools - LZMA compression support in TIFF decoder - support for H.261 RTP payload format (RFC 4587) - HEVC/H.265 RTP payload format (draft v6) depacketizer - added codecview filter to visualize information exported by some codecs -- matroska 3d support thorugh side data +- Matroska 3D support thorugh side data - HTML generation using texi2html is deprecated in favor of makeinfo/texi2any @@ -38,7 +38,7 @@ version 2.3: - libbs2b-based stereo-to-binaural audio filter - libx264 reference frames count limiting depending on level - native Opus decoder -- display matrix export and rotation api +- display matrix export and rotation API - WebVTT encoder - showcqt multimedia filter - zoompan filter |