diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 20:22:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 20:22:31 +0200 |
| commit | 42af97dbc0fa3beff04c2685d0c13ce335b14589 (patch) | |
| tree | 1b662f8ee60c4d444f498fd07cebd6000414f3f4 /libavformat/subtitles.c | |
| parent | e3c24f663ea795c5455301d5f00e46ca455e7afb (diff) | |
| parent | ca2f6b6932144c3ec7828c4b828af80b9e36e38a (diff) | |
| download | ffmpeg-42af97dbc0fa3beff04c2685d0c13ce335b14589.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/concat: reject empty scripts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.c')
0 files changed, 0 insertions, 0 deletions