aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/icoenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 23:37:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-21 23:42:37 +0200
commit359a719f5fb15051bb94f7c389efacedfc3599b2 (patch)
tree5774f4042e3bdbbd56c38d7de3120e3c9be9c1f6 /libavformat/icoenc.c
parent451c78740ae37daf0760a79b293e609655e4e531 (diff)
parentf34d3173fcfc7f3228095d509a64c4fa4b37b575 (diff)
downloadffmpeg-359a719f5fb15051bb94f7c389efacedfc3599b2.tar.gz
Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'
* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575': avcodec/fic: fix slice checks See: d46ef40129487143f2fa4e0b44b3f5e788c4fcb2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icoenc.c')
0 files changed, 0 insertions, 0 deletions