aboutsummaryrefslogtreecommitdiffstats
path: root/doc/codecs.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-13 22:54:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-13 22:54:31 +0200
commit313d75cd4300316f6c8de7ef3473275f454e986a (patch)
treede3cb7f5e52c196d78ceb9dd140dd25399255203 /doc/codecs.texi
parent69a5cd9feac5382c378ff1613f586b37f34d8961 (diff)
parent7e38903b5c86a759549e70647ae42bb22d353b14 (diff)
downloadffmpeg-313d75cd4300316f6c8de7ef3473275f454e986a.tar.gz
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
* commit '7e38903b5c86a759549e70647ae42bb22d353b14': http: enable icy metadata by default. Conflicts: Changelog libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/codecs.texi')
0 files changed, 0 insertions, 0 deletions