Michael Niedermayer 595ba3b962 Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b' ...

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
	libavformat/utils.c
	libavformat/version.h

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

2014-03-24 13:41:49 +01:00

156 KiB

Raw Blame History

View Raw