diff options
| author | Michael Niedermayer <[email protected]> | 2014-05-05 14:39:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-05-05 14:39:13 +0200 |
| commit | 6e397074380e64b177e51d5a9ed2a96e1a5b5f7a (patch) | |
| tree | e82e3b0a5d368ea4c8112a242eb3ecded33d21e0 /ffmpeg_opt.c | |
| parent | db01de4c0af8d44c3b0008861b0a2b685a6b9186 (diff) | |
| parent | 73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3 (diff) | |
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
avconv: simplify exit_program() by using more local vars
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions