Merge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:46:38 +0000 (12:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:52:50 +0000 (12:52 +0200)
commit56e682374ecd78daac42a6e0fc5da799c0d3786b
tree945e9afd45170ef643b2a948e42743f52bf3be65
parentcca229e75a55a5755abf7dc4547d9dce42e2edc8
parentb85dbe68e222586fd77332716eb8ed5724db4e1b
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>