libavutil/downmix_info.c · 3aaff803489af21011b8cf03847e17b29643c922 · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit 'c98f3169':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

a2bc6c11

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit 'c98f3169':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

downmix_info.c 1.27 KiB