diff options
| author | Michael Niedermayer <[email protected]> | 2014-08-08 16:08:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-08-08 16:08:16 +0200 |
| commit | b52952c6e96b7f1464a3829da9d9fec28ed262b3 (patch) | |
| tree | fd0c9381faf4371bcd3153bb4edb38aee28a7c51 /libavutil/parseutils.h | |
| parent | b65c290f7fecde65755cfb4ae1e452dcd0f07464 (diff) | |
| parent | ecda9b90eccc687202fe9fa20f7ca61d92d816b4 (diff) | |
Merge commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4' into release/1.1
* commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4':
Update Changelog for v9.15
Conflicts:
Changelog
Not merged as the changelog doesnt apply 1:1 to FFmpeg
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/parseutils.h')
0 files changed, 0 insertions, 0 deletions