[FFmpeg-cvslog] Merge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 12:46:38 2013 +0200| [56e682374ecd78daac42a6e0fc5da799c0d3786b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56e682374ecd78daac42a6e0fc5da799c0d3786b
---