diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 14:02:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 14:02:03 +0200 |
| commit | e0492311c8541da55a4b08641364ce8e1a169740 (patch) | |
| tree | 2842224326b912fe570668965fb4d9773d021570 /libavdevice/dshow_filter.c | |
| parent | 4a73fa19ca7ac74f16422eabf731b86796b7d588 (diff) | |
| parent | e76f2d11970484266e67a12961f2339a5c2fccf9 (diff) | |
| download | ffmpeg-e0492311c8541da55a4b08641364ce8e1a169740.tar.gz | |
Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'
* commit 'e76f2d11970484266e67a12961f2339a5c2fccf9':
hevc: eliminate the last element from TransformTree
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_filter.c')
0 files changed, 0 insertions, 0 deletions