diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:46:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:52:50 +0200 |
| commit | 56e682374ecd78daac42a6e0fc5da799c0d3786b (patch) | |
| tree | 945e9afd45170ef643b2a948e42743f52bf3be65 /ffmpeg_opt.c | |
| parent | cca229e75a55a5755abf7dc4547d9dce42e2edc8 (diff) | |
| parent | b85dbe68e222586fd77332716eb8ed5724db4e1b (diff) | |
| download | android_external_ffmpeg-56e682374ecd78daac42a6e0fc5da799c0d3786b.tar.gz android_external_ffmpeg-56e682374ecd78daac42a6e0fc5da799c0d3786b.tar.bz2 android_external_ffmpeg-56e682374ecd78daac42a6e0fc5da799c0d3786b.zip | |
Merge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'
* commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b':
avconv: Call exit_program instead of exit in avconv_opt as well
Conflicts:
ffmpeg_opt.c
See: eeddeb6579d8133871dc15f989ab8ffec5b5b396
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions