Changeset cac07d0e in ffmpeg

Timestamp:

May 1, 2014, 2:41:41 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

18516439

Parents:

b7dd250b (diff), 5fccedaa (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 '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

• commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd': lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:

doc/APIchanges

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

(No files)