1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavutil
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-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-12-05 20:25:32 +01:00
2013-02-01 03:56:51 +01:00
2012-10-31 17:01:52 +01:00
2013-01-24 00:49:47 +01:00
2013-01-24 00:49:47 +01:00
2012-08-09 01:44:15 +02:00
2012-10-28 14:33:41 +01:00
2012-12-08 01:34:28 +01:00
2012-10-06 14:03:15 +02:00
2012-11-23 18:10:02 +01:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2013-01-05 16:25:37 +01:00