diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:20:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:20:26 +0200 |
| commit | 4abd5a431823e4f816c2295d9086b725df1f0358 (patch) | |
| tree | 9959c95f53d5b5decc0040349c0469fb87cfea79 /CREDITS | |
| parent | 2280b539c5050364d68e2cdbef2a0d3a7047544f (diff) | |
| parent | 274e134e49b1c92db0f0b8cb2ae7554fb7b9184c (diff) | |
| download | ffmpeg-4abd5a431823e4f816c2295d9086b725df1f0358.tar.gz | |
Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
avconv: check that the output format context exists before accessing it
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions