Merge commit 'a79e58cdc6e46c62346d13e7ddd4da2008714200' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 17:00:30 +0000 (19:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 17:00:30 +0000 (19:00 +0200)
commita94fe0e15148435a32ecde30b984de79751bd094
treeac05baf804e80f499ceea9a3f52135b320f708df
parent688ab26604749539cfa5143bfc61a9d9f4d642aa
parenta79e58cdc6e46c62346d13e7ddd4da2008714200
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>