Michael Niedermayer a63dc846b5 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavu: avoid clashing definition of E
  doc: developer: Add a note about reserved system name space

Conflicts:
	libavutil/internal.h

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

2013-02-12 14:10:36 +01:00

5.0 KiB

Raw Blame History

View Raw