diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:07:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:07:49 +0100 |
| commit | 0d5af820f7be073963f270e4387938f199e1facf (patch) | |
| tree | 45e11e9d72d95bb694ca9803a27ee05fdc3b78c8 /libavformat/caf.c | |
| parent | c23d7de22ec0c14ad35d40c9073451c64a5ce74d (diff) | |
| parent | eb335f3c5ce37f2b93c993e28404d113bee843bc (diff) | |
| download | ffmpeg-0d5af820f7be073963f270e4387938f199e1facf.tar.gz | |
Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'
* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
hevc: reduce variable scope
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/caf.c')
0 files changed, 0 insertions, 0 deletions