diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:54:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:54:41 +0100 |
| commit | e078549421b2845799abe878fc2a60ec89399fcc (patch) | |
| tree | 5a96ccebdc6ce207a18a86dc0ddc0dff6e3394a1 /libavresample/audio_convert.c | |
| parent | 30156eab6d816878bb404fb1565d026aad0d2d9e (diff) | |
| parent | a7b365ae191f45a0d7ed7b34033d5d0cbdd47139 (diff) | |
| download | ffmpeg-e078549421b2845799abe878fc2a60ec89399fcc.tar.gz | |
Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
hevc: reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.c')
0 files changed, 0 insertions, 0 deletions