diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 12:42:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 12:42:38 +0100 |
| commit | db61d34e83099a22d02500986d9135e4b5bceae8 (patch) | |
| tree | f3d730fa6df134b69c94058c80b91824ac8790f8 /libavcodec/hevcpred.c | |
| parent | 309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3 (diff) | |
| parent | 1cc6fef0671c5522c952671ee06bf973135a22c4 (diff) | |
| download | ffmpeg-db61d34e83099a22d02500986d9135e4b5bceae8.tar.gz | |
Merge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4
* commit '1cc6fef0671c5522c952671ee06bf973135a22c4':
Prepare for 11.1 Release
Conflicts:
RELEASE
Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcpred.c')
0 files changed, 0 insertions, 0 deletions