diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:52:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:52:58 +0100 |
| commit | 01d012ba3db91d555b6905d21afcb232150b9ecf (patch) | |
| tree | d656893d72e6eda4f1e22cc89fed0869190c558b /libavcodec/ass_split.c | |
| parent | 324498f824701ab0bc1f666269e073c8922703ca (diff) | |
| parent | 29f1fa74225e9fdbab6d590857edbecb51cf74da (diff) | |
| download | ffmpeg-01d012ba3db91d555b6905d21afcb232150b9ecf.tar.gz | |
Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
configure: Move newlib libc check before mingw libc check
avisynth: Change demuxer name to avoid conflicts with AVS
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass_split.c')
0 files changed, 0 insertions, 0 deletions