diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 14:48:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 15:00:36 +0100 |
| commit | b28c37156782e563341e1bccc1a15dfbc01a569f (patch) | |
| tree | fc8ef8978bf3d9fd44248d3e4ec2caed36edcd3f /libavcodec/g722enc.c | |
| parent | 24e2a82f75abbe977b7ddab52a90ce4d3e57a9f8 (diff) | |
| parent | 6bffa83bbeac4820f7705188e20f2e307e832fd7 (diff) | |
| download | ffmpeg-b28c37156782e563341e1bccc1a15dfbc01a569f.tar.gz | |
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>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions