Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 20:11:59 +0000 (21:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 20:12:02 +0000 (21:12 +0100)
commit246eae98cfe4eee9c3a812962b3af51749c59fa8
treecfc5eee22e1ae8bc5e9d55445a6af13fb7b7e4f3
parent5367c0be623885eb0fcd0542564150d79d881a1c
parent1db03a68641193832fc759c88049adbe8a449310
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: return an error if a avresample_open() is called on an open context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/utils.c