Changeset 56e68237 in ffmpeg

Timestamp:

Aug 1, 2013, 10:52:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4f07fcd3

Parents:

cca229e7 (diff), b85dbe68 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 10:46:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 10:52:50)

Message:

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>

(No files)