diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:15:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:15:06 +0100 |
| commit | a7fa1b9aa104491e44a0489e09febe036c70f4f9 (patch) | |
| tree | 7b3bd98612d4deb3678fef9c58aca7e02bcd34ad /libavformat/matroska.h | |
| parent | 74e5a5a849bc57df564eca4cf60e1da4148c2e83 (diff) | |
| parent | 443b71928b2f36362e805c037751e6c3c79ea4e8 (diff) | |
| download | ffmpeg-a7fa1b9aa104491e44a0489e09febe036c70f4f9.tar.gz | |
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
hevc: unref the current frame if frame_start() fails
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions