aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/htmlsubtitles.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-11-10 17:54:06 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-11-10 17:54:06 +0100
commit2e82d51714c74a20bd5e3440836c16d608e3df7a (patch)
tree8909ccab6477f3a305a7dd4179fbf7cf883a4161 /libavcodec/htmlsubtitles.h
parent8600fef123bf00403c8d591c5345ed03b683572d (diff)
parent4dfbc7a7559ccab666a8fd39de4224eb4b02c768 (diff)
downloadffmpeg-2e82d51714c74a20bd5e3440836c16d608e3df7a.tar.gz
Merge commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768'
* commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768': msnwc_tcp: Correctly report failure Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/htmlsubtitles.h')
0 files changed, 0 insertions, 0 deletions