Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 17:31:41 +0000 (18:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 17:31:41 +0000 (18:31 +0100)
commit1654e64bba809d3fde8b4cb8a1615796a218c36f
tree6a9e2d4ffb792be5720f1248bc01537c6a9d4354
parenta805e2e6530104e9e6211f51fdab55d905da3eda
parentc68d4c230ad8ca85af3999a6af8e582c43620d58
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video_parser.c