aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/stldec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-03 21:53:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 21:53:29 +0100
commit46a16ca15a68bfd7341dd9783ecf39bbdf80d08e (patch)
tree44bfaeb9dcce7a96e9a05733d4326dee21fe52af /libavformat/stldec.c
parentb37858eae186ff84afd38cf3e845ba6e037e6397 (diff)
parent75439bb31b3ab76f9a4d30c5de4ff9f407ec8128 (diff)
downloadffmpeg-46a16ca15a68bfd7341dd9783ecf39bbdf80d08e.tar.gz
Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'
* commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128': siff: K&R formatting cosmetics Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/stldec.c')
0 files changed, 0 insertions, 0 deletions