Changeset 03bb99ae in ffmpeg

Timestamp:

Jun 1, 2014, 11:46:38 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

05c5dd40

Parents:

0ccfcb06 (diff), 0957b274 (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 '0957b274e312e985d69cb490bee2a7ff820acaa6'

• commit '0957b274e312e985d69cb490bee2a7ff820acaa6': lavc: add an option to enable side data-only packets during encoding

Conflicts:

libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h

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

(No files)