diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:04:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:04:31 +0100 |
| commit | 0c7733904e54472fa5bea04b4a7c35ff6fea9890 (patch) | |
| tree | 0f1950c6bae6e403e6625e69fa3febefbd8fd00a /tests/ref/seek/acodec-alac | |
| parent | a400edbb6d00c0211de38e4f1b4f593681db91d8 (diff) | |
| parent | bcbdeb318e0828cf00b458885ffa1e1596c85d06 (diff) | |
| download | ffmpeg-0c7733904e54472fa5bea04b4a7c35ff6fea9890.tar.gz | |
Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'
* commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06':
asvenc: Forward the error instead of asserting on it
Conflicts:
libavcodec/asvenc.c
Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek/acodec-alac')
0 files changed, 0 insertions, 0 deletions