Michael Niedermayer 76f8d3c8d9 Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174' ...

* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
	libavutil/version.h

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

2013-03-01 13:19:00 +01:00

8.2 KiB

Raw Blame History

View Raw