aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp56rac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-05 16:19:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-05 16:19:17 +0100
commit85e94a30eeb97ac73959fa0e330c5c68e31942e6 (patch)
tree5e5d68b439eef42d44e0b217938acc1caf250f5d /libavcodec/vp56rac.c
parent3445bec6fc1de92a6ebef1ada2e5aa850fde9e94 (diff)
parent62de693a17f9b107be7867d822d5accacd4be544 (diff)
downloadffmpeg-85e94a30eeb97ac73959fa0e330c5c68e31942e6.tar.gz
Merge commit '62de693a17f9b107be7867d822d5accacd4be544' into release/1.1
* commit '62de693a17f9b107be7867d822d5accacd4be544': rtp: Make sure priv_data is set before reading it videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL get_bits: change the failure condition in init_get_bits mpegvideo: fix loop condition in draw_line() Conflicts: libavcodec/get_bits.h libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56rac.c')
0 files changed, 0 insertions, 0 deletions