diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
| commit | 7a6034805305cb5d6a3d755d774f0ad09119049e (patch) | |
| tree | 7062d51b46c39f95dec61723b03f40158285c11b /Changelog | |
| parent | 64f73acd1d3853e55a7cd7631987dfd83c4171e7 (diff) | |
| parent | 7e244c68600f479270e979258e389ed5240885fb (diff) | |
| download | ffmpeg-streaming-7a6034805305cb5d6a3d755d774f0ad09119049e.zip ffmpeg-streaming-7a6034805305cb5d6a3d755d774f0ad09119049e.tar.gz | |
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -13,6 +13,7 @@ version <next> - remove mp3_header_compress bitstream filters - Windows resource files for shared libraries - aeval filter +- stereoscopic 3d metadata handling version 2.1: |
