Changeset 7dea2eab in ffmpeg

Timestamp:
Sep 16, 2013, 10:27:40 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7129935e
Parents:
bcac6b43 (diff), 5c2be81 (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> (09/16/13 22:27:37)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/16/13 22:27:40)
Message:

Merge remote-tracking branch 'cehoyos/master'

  • cehoyos/master: Do not suggest to increase probesize for image2 files.

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.