aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cdxl.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 12:18:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 12:18:25 +0100
commitede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19 (patch)
treec288d3a3a358016a16aefbe702b454a9777cf98f /libavcodec/cdxl.c
parent127ff88639e78b9d16fecb973c41b86a843b4fa7 (diff)
parent25841dfe806a13de526ae09c11149ab1f83555a8 (diff)
downloadffmpeg-ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19.tar.gz
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
* commit '25841dfe806a13de526ae09c11149ab1f83555a8': Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter. Conflicts: libavcodec/alpha/dsputil_alpha.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdxl.c')
0 files changed, 0 insertions, 0 deletions