FFmpeg/libavcodec
Michael Niedermayer 5fce29ef29 Merge commit '2db953f84671997e936f91140ffb5143c1537844'
* commit '2db953f84671997e936f91140ffb5143c1537844':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 14:00:01 +02:00
..
2014-07-16 20:55:24 +02:00
2014-06-15 12:11:46 +02:00
2014-06-15 12:11:46 +02:00
2014-07-16 14:27:45 +02:00
2014-07-10 15:29:54 +02:00
2014-07-10 17:27:56 +02:00
2014-06-05 20:31:59 +02:00
2014-06-05 20:31:59 +02:00
2014-07-12 01:09:51 +02:00
2014-07-16 21:24:11 +02:00
2014-07-12 22:33:27 +02:00
2014-06-07 17:44:23 +02:00
2014-06-07 17:44:14 +02:00
2014-06-07 17:44:14 +02:00
2014-07-10 15:29:54 +02:00
2014-06-18 03:13:37 +02:00
2014-07-16 14:38:42 +02:00
2014-06-18 03:13:37 +02:00
2014-06-18 03:13:36 +02:00
2014-06-18 03:13:36 +02:00