OSDN Git Service

Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Mar 2014 20:44:44 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Mar 2014 20:44:44 +0000 (21:44 +0100)
commit411f8f4c9a05796e22e12bf0a22c967f28c2d430
tree6443c412bc0e64ad2e0b8eb27b19ecc552427913
parentdfefc9097e9b4bb20442e65454a40043bd189b3d
parent5c9c305d14730faf2af206e5d519df4948de0ed2
Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'

* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
  ass: K&R formatting cosmetics

Conflicts:
libavformat/assdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/assdec.c