mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
b28c371567
* 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>