aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/oss_audio.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-11 20:17:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-11 20:39:20 +0200
commitd912e449b655797407a75527380c566955b71a8e (patch)
tree392b432edecba4d8a714da69dc123900d43b5be9 /libavdevice/oss_audio.c
parent961a1a81d88a05afabb895f8a9dd11e789a07d89 (diff)
parentc766eb1ce1edb3ad03472b78c21e42c543b04937 (diff)
downloadffmpeg-d912e449b655797407a75527380c566955b71a8e.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ac3enc: add macros for option names to make them more understandable. ac3enc: fix 'channel_coupling' option to actually allow 'auto'. cavs: fix some crashes with invalid bitstreams ac3enc: clip coupling coordinates during calculation Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample. lavc: fix parentheses placement in avcodec_open2(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/oss_audio.c')
0 files changed, 0 insertions, 0 deletions