aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-17 14:30:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-17 14:30:33 +0100
commit975fbd43addbf70c047167b761ddcf06e8083c14 (patch)
tree9f33eb323cea5b961dc96f8b71d8d26483eec635 /libavformat
parentfa7031ad37526bc9916e87dda25547ebbb6f4a3b (diff)
parent7e6c67dd24d767bfa71ec9cfefca5833535aaa84 (diff)
downloadffmpeg-975fbd43addbf70c047167b761ddcf06e8083c14.tar.gz
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: lavfi/buffersink: fix header. lavfi/buffersrc: disable deprecated warnings. lavfi/buffersrc: check channel count changes. lavfi/buffersrc: set channel layout if it is known. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions