mirror of https://github.com/FFmpeg/FFmpeg.git
* 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>pull/101/head
commit
0c7733904e
1 changed files with 2 additions and 1 deletions
Loading…
Reference in new issue