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
..
2012-10-08 11:22:42 +02:00
2013-01-31 12:12:15 +01:00
2013-02-06 22:55:36 +01:00
2012-01-28 11:04:19 +01:00
2012-12-15 11:46:47 +01:00
2013-01-21 10:24:45 +00:00
2013-02-09 20:50:11 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2012-10-02 09:43:27 +02:00
2012-12-21 00:18:34 +01:00