Michael Niedermayer 0c7733904e 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>

2014-12-15 12:04:31 +01:00

12 KiB

Raw Blame History

View Raw