diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:00:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:00:30 +0200 |
commit | a94fe0e15148435a32ecde30b984de79751bd094 (patch) | |
tree | ac05baf804e80f499ceea9a3f52135b320f708df /libavcodec/movsub_bsf.c | |
parent | 688ab26604749539cfa5143bfc61a9d9f4d642aa (diff) | |
parent | a79e58cdc6e46c62346d13e7ddd4da2008714200 (diff) | |
download | ffmpeg-a94fe0e15148435a32ecde30b984de79751bd094.tar.gz |
Merge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10
* commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200':
Update Changelog for v0.8.14
Prepare for 0.8.14 Release
Conflicts:
Changelog
RELEASE
No change as this does not apply to FFmpeg 1:1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movsub_bsf.c')
0 files changed, 0 insertions, 0 deletions