diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-13 13:48:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-13 13:48:43 +0200 |
commit | fc477263fadd22434ac0ad8ab9ad15b41dd9be98 (patch) | |
tree | e4b2b1eda6484ad2a1cae2677738a4aa18633c31 /libavcodec/ass_split.c | |
parent | 3c89ec2816956cb1d51a518a5c4a638aa86749e9 (diff) | |
parent | aca25104ea9c38e662e78bdefa967c8cf9e48584 (diff) | |
download | ffmpeg-fc477263fadd22434ac0ad8ab9ad15b41dd9be98.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm-dvd: Minor leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass_split.c')
0 files changed, 0 insertions, 0 deletions