1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-08 22:39:44 +02:00
FFmpeg/libavutil
Michael Niedermayer 8ccc58bb7d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavu: Move preprocessor macros in a separate file

Conflicts:
	libavutil/avutil.h
	libavutil/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-30 11:23:32 +01:00
..
2013-11-03 00:58:31 +01:00
2013-11-03 00:58:31 +01:00
2013-12-11 21:13:51 +01:00
2013-12-22 22:25:15 +01:00
2013-11-04 15:38:52 +01:00
2013-12-22 22:35:23 +01:00
2013-10-23 14:32:04 +02:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-11-22 17:16:11 +01:00
2013-11-03 00:59:38 +01:00
2013-11-03 00:59:38 +01:00