diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:19:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:20:42 +0200 |
| commit | cde2de4a05dc5959f1ae10a92879a2244f25b4fd (patch) | |
| tree | aaae22c7f9a6167872c54463b2add23b928d2faa /libavformat/allformats.c | |
| parent | e6ffe7bcfc4a559624fdb543612d9ec839891793 (diff) | |
| parent | 3505b19652ea34089a4cd08d4d3358fcc0a3db8b (diff) | |
| download | ffmpeg-cde2de4a05dc5959f1ae10a92879a2244f25b4fd.tar.gz | |
Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'
* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b':
hevc: derive partially amvp list
Conflicts:
libavcodec/hevc_mvs.c
See: bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938
See: 3ad046083119abd3b063964bd79797e9935305e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions