aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dnxhdenc.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-02 10:38:12 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-02 10:38:12 +0200
commit9ed59f16e005554fe412bcc05b2ed40688f4fd16 (patch)
tree2827c201867aaa7610ec8042a122295cf53b44f8 /libavcodec/dnxhdenc.h
parent988ddfea5e32226448e353766c8d9b610914e087 (diff)
parent7a7df34c91e16ea8936f59524145a2cdd6b790f9 (diff)
downloadffmpeg-9ed59f16e005554fe412bcc05b2ed40688f4fd16.tar.gz
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9': blowfish: add av_blowfish_alloc() Conflicts: doc/APIchanges libavutil/version.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dnxhdenc.h')
0 files changed, 0 insertions, 0 deletions