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)
commitb28c37156782e563341e1bccc1a15dfbc01a569f
treefc8ef8978bf3d9fd44248d3e4ec2caed36edcd3f
parent24e2a82f75abbe977b7ddab52a90ce4d3e57a9f8
parent6bffa83bbeac4820f7705188e20f2e307e832fd7
Merge remote-tracking branch 'cigaes/master'

* 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>