diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 12:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 12:28:07 +0200 |
| commit | a3d9a21683557d1e6c4c4018eb7979a9504fff0d (patch) | |
| tree | 1dd810e48ad639145362750caabb68f8012ab09a /COPYING.GPLv3 | |
| parent | 40e8967ee161a9d247419e77da745e939f0ddaf8 (diff) | |
| parent | bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7 (diff) | |
| download | ffmpeg-a3d9a21683557d1e6c4c4018eb7979a9504fff0d.tar.gz | |
Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
imc: Catch a division by zero
atrac3: Error on impossible encoding/channel combinations
See: 13451f5520ce6b0afde861b2285dda659f8d4fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions