diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:39:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:39:58 +0200 |
| commit | 17cbc6457b7a0c38fececc3e0ecff99cc8c96526 (patch) | |
| tree | 6f03a3363d67891074e6f8cd64fb9fc1bc46c3c4 /libavdevice/alsa-audio-enc.c | |
| parent | 5195512addc1f6bced2e33b8faf77abb5b8703b6 (diff) | |
| parent | cf6090dc6252f2b276aa4133e3d73a89f4c6046c (diff) | |
| download | ffmpeg-17cbc6457b7a0c38fececc3e0ecff99cc8c96526.tar.gz | |
Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'
* commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c':
hevc: use intreadwrite
Conflicts:
libavcodec/hevc_mvs.c
See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions