aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_cabac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-03 02:27:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-03 02:27:34 +0200
commitc437ab3c4ea2578e68e39e4bf32dda2ff6a1ed07 (patch)
tree1c0bf58b65e321dbf1f0be3dd46acde2671530d7 /libavcodec/h264_cabac.c
parentb827189c6f8a42b70ac68072d01b2dad1bfc00e6 (diff)
parenta0a90b1a1116250a2494021da810cc5da89ea36f (diff)
downloadffmpeg-c437ab3c4ea2578e68e39e4bf32dda2ff6a1ed07.tar.gz
Merge commit 'a0a90b1a1116250a2494021da810cc5da89ea36f' into release/0.10
* commit 'a0a90b1a1116250a2494021da810cc5da89ea36f': tiffdec: use bytestream2 to simplify overread/overwrite protection Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
0 files changed, 0 insertions, 0 deletions