aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/buffersink.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-04 23:35:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-04 23:35:42 +0200
commit9c4821ca7b4894e2b04c18d777ff499d847e51ba (patch)
treef7c3890b0f84ecc1cb5e6641fb44e81a7d449ce1 /libavfilter/buffersink.c
parent944d049eaa1ca829d97c2877ec9524c049148e14 (diff)
parent22505c188ca96f123ebf10acc7e00130b5f5e079 (diff)
downloadffmpeg-9c4821ca7b4894e2b04c18d777ff499d847e51ba.tar.gz
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: calculate audio diff threshold based on the actual settings ffplay: try more channel count combinations for SDL_OpenAudio ffplay: simplify audio_open, rename parameters to more explanatory names ffplay: remove VideoState from audio_open ffplay: put audio parameters to their own struct ffplay: put audio_open into a seperate function Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.c')
0 files changed, 0 insertions, 0 deletions