1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
Michael Niedermayer 7bd417c22a Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
	libavformat/Makefile
	libavutil/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07 11:26:28 +02:00
..
2013-06-30 13:47:44 +02:00
2012-12-05 20:25:32 +01:00
2013-03-07 01:12:04 +01:00
2013-05-24 15:36:54 +02:00
2013-06-15 02:22:16 +02:00
2013-04-13 23:48:26 +02:00
2013-01-24 00:49:47 +01:00
2013-03-19 00:47:00 +01:00
2013-06-16 12:49:39 +02:00
2013-06-15 18:49:12 -03:00
2013-06-12 01:47:42 +02:00
2013-06-15 18:54:01 -03:00
2013-06-15 02:22:39 +02:00
2013-05-15 12:10:09 +02:00
2013-05-13 21:42:37 +02:00
2013-07-03 20:32:30 +00:00
2013-05-17 11:32:53 +00:00
2013-04-15 20:31:06 +02:00
2013-05-22 21:18:08 +02:00
2013-06-15 18:54:01 -03:00
2013-06-02 11:27:19 +02:00
2013-06-02 18:51:09 +02:00
2013-06-13 14:57:00 +02:00
2012-10-31 03:10:35 +01:00