diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 21:36:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 21:52:51 +0100 |
| commit | 792845e436ddc5f3ce11ba02535a3372919061f2 (patch) | |
| tree | 1083b9be59c64021b0e7d77d4e536d139b849de3 /libavfilter/version.h | |
| parent | 1d6666a6b828cca6c6b355a9b62f25607b1ced08 (diff) | |
| parent | 3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c (diff) | |
| download | ffmpeg-792845e436ddc5f3ce11ba02535a3372919061f2.tar.gz | |
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
Bump libavutil major version to account for the LLS API/ABI changes.
Conflicts:
libavutil/version.h
Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
0 files changed, 0 insertions, 0 deletions