Changeset cc61ef04 in ffmpeg

Timestamp:

Jun 23, 2013, 10:56:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

780b1aa1

Parents:

d894e64a (diff), 42cc6cef (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> (06/23/13 10:56:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/23/13 10:56:55)

Message:

Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'

• commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790': avconv: report the error for codec open failure

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)