diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-18 03:56:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-18 03:56:09 +0100 |
| commit | fa1ca88cb6fcd36b39599c4f2608a774909c1645 (patch) | |
| tree | e40c02b714170f59e239a55d1a2bae9fd10be070 /libavfilter/libmpcodecs/mp_msg.h | |
| parent | 2b95572b10ec8188f7e4061046a0c66a8ebd8e85 (diff) | |
| parent | 4039f11ed82d84009b5146f0a563f33ced33e4db (diff) | |
Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4
* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
Prepare for 11.2 Release
Conflicts:
RELEASE
Merge for metadata only as this is not correct for 2.4.*
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/libmpcodecs/mp_msg.h')
0 files changed, 0 insertions, 0 deletions