diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 15:45:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 15:54:56 +0400 |
| commit | 514940773196b7c242875fb3c4e6fc18a89d1dbd (patch) | |
| tree | 651e0fa01fe5bef927d96ab749f17530b98c10ef /libswscale/swscale_unscaled.c | |
| parent | 65af5e815a7aa9a9443bb0a48875f366ae812b5c (diff) | |
| parent | a943a132f36f4df8fe2f749744677b71984abce7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: check the maximum number of channels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions