Michael Niedermayer c738ffcf2c Merge commit '58c215961a9067bb670387bbd72286c30de04b93' ...

* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

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

2014-03-17 15:43:55 +01:00

14 KiB

Raw Blame History

View Raw