diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 12:33:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 12:33:07 +0200 |
| commit | e925a82e2478adfbfb17813729ed8e68cf9c7120 (patch) | |
| tree | d0aba4224dd836e1912a3af938849c33c5899854 /libavdevice/alsa-audio-enc.c | |
| parent | 504475f38ef049996c2c7954de00e92668a05de5 (diff) | |
| parent | f134b5ec53b4cb51cb69bf0c64de87687ea72b12 (diff) | |
| download | ffmpeg-e925a82e2478adfbfb17813729ed8e68cf9c7120.tar.gz | |
Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'
* commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12':
apichanges: fill in changes for lavu 51.19 and 51.20
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions