Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
	libavformat/lmlm4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/lmlm4.c
index c8ea421,1fb03e7..899f449
--- 1/libavformat/lmlm4.c
--- 2/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@@ -34,12 -35,13 +35,13 @@@
  
  #define LMLM4_MAX_PACKET_SIZE   1024 * 1024
  
- static int lmlm4_probe(AVProbeData * pd) {
+ static int lmlm4_probe(AVProbeData *pd)
+ {
 -    unsigned char *buf = pd->buf;
 +    const unsigned char *buf = pd->buf;
      unsigned int frame_type, packet_size;
  
-     frame_type  = AV_RB16(buf+2);
-     packet_size = AV_RB32(buf+4);
+     frame_type  = AV_RB16(buf + 2);
+     packet_size = AV_RB32(buf + 4);
  
      if (!AV_RB16(buf) && frame_type <= LMLM4_MPEG1L2 && packet_size &&
          frame_type != LMLM4_INVALID && packet_size <= LMLM4_MAX_PACKET_SIZE) {