[FFmpeg-cvslog] Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 15 12:04:31 2014 +0100| [0c7733904e54472fa5bea04b4a7c35ff6fea9890] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c7733904e54472fa5bea04b4a7c35ff6fea9890
---