diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:19:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:19:17 +0100 |
| commit | 85e94a30eeb97ac73959fa0e330c5c68e31942e6 (patch) | |
| tree | 5e5d68b439eef42d44e0b217938acc1caf250f5d /libavcodec/arm | |
| parent | 3445bec6fc1de92a6ebef1ada2e5aa850fde9e94 (diff) | |
| parent | 62de693a17f9b107be7867d822d5accacd4be544 (diff) | |
| download | ffmpeg-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/arm')
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S index c3cd459764..48a6c3ba83 100644 --- a/libavcodec/arm/videodsp_armv5te.S +++ b/libavcodec/arm/videodsp_armv5te.S @@ -22,7 +22,6 @@ #include "config.h" #include "libavutil/arm/asm.S" -#if HAVE_ARMV5TE_EXTERNAL function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0] @@ -30,4 +29,3 @@ function ff_prefetch_arm, export=1 bne ff_prefetch_arm bx lr endfunc -#endif |