diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:03:59 +0200 |
| commit | 2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39 (patch) | |
| tree | 3d0f0530f95e64ad0cf4ad06fa363176687714f7 /doc/ffprobe.xsd | |
| parent | 453224f10b375c280ab2ef8f6e40213ba5b77d8a (diff) | |
| parent | 53a11135f2fb2123408b295f9aaae3d6f861aea5 (diff) | |
| download | ffmpeg-2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39.tar.gz | |
Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'
* commit '53a11135f2fb2123408b295f9aaae3d6f861aea5':
hevc: simplify splitting the transform tree blocks
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.xsd')
0 files changed, 0 insertions, 0 deletions