diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 12:09:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 12:09:07 +0200 |
| commit | 1924a61a0a39dfb216f09a6d4d3cb9a1f8a758b4 (patch) | |
| tree | 6c48c88fbca967a08bd43c8ceae6dc8234713f2e /version.sh | |
| parent | 3319679d0a36bec3e78f639d6f9fbbe596f6eec3 (diff) | |
| parent | 3d624420086ed3cd0c74f4510f0285968e21c117 (diff) | |
| download | ffmpeg-1924a61a0a39dfb216f09a6d4d3cb9a1f8a758b4.tar.gz | |
Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'
* commit '3d624420086ed3cd0c74f4510f0285968e21c117':
avconv_opt: allocate an OutputFile before the streams.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions