Changeset f48366c7 in ffmpeg

Timestamp:

Jun 24, 2013, 9:42:42 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a46e578d

Parents:

a620c832 (diff), e21307a (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.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:

libavformat/mux.c

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

(No files)