aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/librtmp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:01:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-16 12:01:22 +0200
commita87cf3689ef2a1a53a022d664f3687d506ab08b1 (patch)
treeb81ce88a8383bc538a1fb33627c9ee1a4bf790fd /libavformat/librtmp.c
parent15677e72399d12911128e7109a7e4101226f48d6 (diff)
parent8747fce91fca6bb8e9936497f2de05c905cf43b5 (diff)
downloadffmpeg-a87cf3689ef2a1a53a022d664f3687d506ab08b1.tar.gz
Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'
* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5': electronicarts: K&R formatting cosmetics Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions