aboutsummaryrefslogtreecommitdiffstats
path: root/doc/platform.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-06 13:00:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-06 13:00:47 +0200
commit2a27e5255071e2bac7f78f484c528d0810be73a0 (patch)
tree1dbda94e03f632ad22be3fef1bcac29aeb1cb446 /doc/platform.texi
parent61845dc74afce9c33583eb1d0ed82c115ff61d4b (diff)
parent7f93a861aaf2e76fd63b53ccc465909873b8dc29 (diff)
downloadffmpeg-2a27e5255071e2bac7f78f484c528d0810be73a0.tar.gz
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29': mpeg12enc: K&R formatting cosmetics Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
0 files changed, 0 insertions, 0 deletions