Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 18:22:05 +0000 (20:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 18:22:31 +0000 (20:22 +0200)
* cigaes/master:
  lavf/concat: reject empty scripts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge