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)
* qatar/master:
  lavr: return an error if a avresample_open() is called on an open context

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

Simple merge