FFmpeg/libavcodec
Michael Niedermayer 18df75fa2f Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 16:19:42 +01:00
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +00:00
2013-10-30 23:56:52 +01:00
2013-11-16 17:43:05 +01:00
2013-10-31 20:19:59 +01:00
2013-11-16 12:48:25 +01:00
2013-11-16 17:43:36 +01:00
2013-11-16 17:50:51 +01:00
2013-11-16 13:27:17 +01:00
2013-10-28 23:54:28 +01:00
2013-10-30 12:41:43 +00:00
2013-11-16 12:49:18 +01:00
2013-10-28 23:54:28 +01:00
2013-11-05 12:44:20 +00:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00