aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/http.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-11 12:09:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-11 12:09:13 +0100
commitff1e9822056804797be7c7844c577565d5aad21d (patch)
tree4e2c7d40a16eed42f8b1a13c90ae20a0911430b3 /libavformat/http.h
parentbb116e6ba39ff908a6d92991a749a1cabc85fe28 (diff)
parent45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d (diff)
downloadffmpeg-ff1e9822056804797be7c7844c577565d5aad21d.tar.gz
Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2
* commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d': doc: fix a couple of typos in frame.h Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.h')
0 files changed, 0 insertions, 0 deletions