Changeset bb6de15d in ffmpeg

Timestamp:

Mar 13, 2014, 1:21:27 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f385a09

Parents:

7d7487e8 (diff), 81498ce (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> (03/13/14 13:16:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/13/14 13:21:27)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avconv: Match stream id

Conflicts:

cmdutils.c
doc/fftools-common-opts.texi

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

(No files)