Michael Niedermayer 03bb99ae1a 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>

2014-06-01 13:46:38 +02:00

77 KiB

Raw Blame History

View Raw