diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:37:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:37:03 +0200 |
| commit | 41dde62d7f4121495150fe0e0db26fc25c737901 (patch) | |
| tree | d4d3ec545abb4268eab0a5ed2aec661b6d62330c /libavdevice/alsa-audio-common.c | |
| parent | d386a523aefe2fed880b5e7d20929e1f65a6e138 (diff) | |
| parent | ce0bc09ee2580d49fec90a6eb0de2ba1b580c854 (diff) | |
| download | ffmpeg-41dde62d7f4121495150fe0e0db26fc25c737901.tar.gz | |
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
hevc: do not change the VPS if its contents are the same
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-common.c')
0 files changed, 0 insertions, 0 deletions