aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-22 17:26:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-22 17:41:45 +0100
commit1d19f1b196c70cf2bd17d486e833bfa257314ef0 (patch)
tree5b62c8269aa4dd106cc7da4094541a7cb7d04c76 /libavformat/rtp.h
parent45ab71a8b86e2dd72654399419c1b2d0ac09c3a5 (diff)
parent393d80cc278e2b2f5c9e7805db176e6f28335a33 (diff)
downloadffmpeg-1d19f1b196c70cf2bd17d486e833bfa257314ef0.tar.gz
Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'
* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33': http: Support relative URL redirection Conflicts: libavformat/http.c See: 4a4c93cb3f2f564263f4b20446a7d500772e0d40 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
0 files changed, 0 insertions, 0 deletions