diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 15:52:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 15:58:07 +0100 |
| commit | 2f980cf39a14f90b9356b51ef1ed6e7816f6aac3 (patch) | |
| tree | faf8d16ad3dc12e37a8f2854bdab16192709f42b /libavdevice/alsa-audio.h | |
| parent | 874c5b02c4117d5261365d0de727c0b4dc9363f6 (diff) | |
| parent | ff953fecffd3b9a616a046723fb9d4690be032a6 (diff) | |
| download | ffmpeg-2f980cf39a14f90b9356b51ef1ed6e7816f6aac3.tar.gz | |
Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'
* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
lavc: set frame properties in ff_get_buffer().
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio.h')
0 files changed, 0 insertions, 0 deletions