Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 13:48:23 +0000 (14:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 14:00:36 +0000 (15:00 +0100)
* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.

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

Trivial merge