summaryrefslogtreecommitdiff
path: root/libavcodec/golomb.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-10 11:51:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-10 11:51:40 +0100
commit4c63beeefe9fcd42f12fe5545a63bb8114e8bea0 (patch)
tree48dd20543396041cdb16e2d74999db7fb0541bc3 /libavcodec/golomb.h
parent53eb4e0799b7c09022eea2fb03d91ffde1f953dd (diff)
parent8cafeb8bca5d079041739dbd72ccec0ead138eaf (diff)
Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'
* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf': mxfdec: Validate parameters to strftime Conflicts: libavformat/mxfdec.c See: 423089e964410adbf13af3de42e3c9dd5a1babd6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/golomb.h')
0 files changed, 0 insertions, 0 deletions