aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bintext.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 15:55:13 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 15:55:13 +0100
commitd1256272b16a36868518f38c0068bb6c724613ed (patch)
tree6da306f52459e1178c7d75c058b0389b49db6d89 /libavcodec/bintext.h
parent90c93fb12948f0b00720df91961a09e187703060 (diff)
parentca5f386e75c592ce25b8184516fd0d580ccb31bb (diff)
downloadffmpeg-d1256272b16a36868518f38c0068bb6c724613ed.tar.gz
Merge commit 'ca5f386e75c592ce25b8184516fd0d580ccb31bb'
* commit 'ca5f386e75c592ce25b8184516fd0d580ccb31bb': lavf: G.723.1 muxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/bintext.h')
0 files changed, 0 insertions, 0 deletions