diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:06:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:06:01 +0100 |
| commit | 8a9feeff9e31e04bbd43a6279e89cba66a3691de (patch) | |
| tree | dbd5cafcfa7d7255284c0cd9967250601e5ab8de /libavutil/dict.h | |
| parent | 2b8effcda3f98e3df48bed305ee416bbe06c7230 (diff) | |
| parent | 2cd5640bce0ee8f515ff05040ce1c18d6af2694c (diff) | |
| download | ffmpeg-8a9feeff9e31e04bbd43a6279e89cba66a3691de.tar.gz | |
Merge commit '2cd5640bce0ee8f515ff05040ce1c18d6af2694c' into release/1.1
* commit '2cd5640bce0ee8f515ff05040ce1c18d6af2694c':
Prepare for 9.17 release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.h')
0 files changed, 0 insertions, 0 deletions