diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:27:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:27:39 +0200 |
| commit | 5195512addc1f6bced2e33b8faf77abb5b8703b6 (patch) | |
| tree | 41bb7964bb08f6bfc56ee98584d34ded7a2152dd /libavdevice/alsa-audio-enc.c | |
| parent | cde2de4a05dc5959f1ae10a92879a2244f25b4fd (diff) | |
| parent | ed53cc217f6a6e4ddb35e3f01a79496091dc82dc (diff) | |
| download | ffmpeg-5195512addc1f6bced2e33b8faf77abb5b8703b6.tar.gz | |
Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'
* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
hevc: derive partial merge list
Conflicts:
libavcodec/hevc_mvs.c
See: 4576eff05d94a5e0b853a7a595d31351cc539e7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions