Changeset 2644df82 in ffmpeg

Timestamp:

Dec 12, 2013, 6:48:36 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

93cf43ec

Parents:

30aa9b72 (diff), ae9d13f (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 commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

• commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a': img2: add stereo 3d still picture file extensions

Conflicts:

libavformat/img2.c

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

(No files)