diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:17:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:17:35 +0100 |
commit | 2e99867a4e43ac2d344a0e9f73885f5c676e1164 (patch) | |
tree | d07cc8338f9ca916354078afd58a20c976146c00 /libavformat/utils.c | |
parent | 03911c418f1a659049dfbe1ca2707670a8e5f731 (diff) | |
parent | d711d839ca6714a5ef5b53ee51bc7632e62cf203 (diff) | |
download | ffmpeg-2e99867a4e43ac2d344a0e9f73885f5c676e1164.tar.gz |
Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions