diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:46 +0100 |
| commit | 0adde39e048868e1b3e2f7c94c4d47f45f5438f9 (patch) | |
| tree | c95592e71cc3abce710bb1a9ed58fe8711e2a343 /libavresample/audio_mix.c | |
| parent | 03ae616b194e873ce22cef1878666b9d3028e56f (diff) | |
| parent | ca2c9d6b9bfadb64e1502594fdf745a391699890 (diff) | |
| download | ffmpeg-0adde39e048868e1b3e2f7c94c4d47f45f5438f9.tar.gz | |
Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2
* commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890':
hevc: make pps/sps ids unsigned where necessary
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions