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 | |
| 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>
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 2 | ||||
| -rw-r--r-- | libavcodec/get_bits.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 |
4 files changed, 3 insertions, 5 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 diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 89df381fdb..ccc009791a 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -379,7 +379,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, int buffer_size; int ret = 0; - if (bit_size >= INT_MAX - 7 || bit_size < 0) { + if (bit_size >= INT_MAX - 7 || bit_size < 0 || !buffer) { buffer_size = bit_size = 0; buffer = NULL; ret = AVERROR_INVALIDDATA; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4609b0b731..e7dcaf41cc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1653,7 +1653,7 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, buf += sx + sy * stride; ex -= sx; f = ((ey - sy) << 16) / ex; - for(x= 0; x <= ex; x++){ + for (x = 0; x <= ex; x++) { y = (x * f) >> 16; fr = (x * f) & 0xFFFF; buf[y * stride + x] += (color * (0x10000 - fr)) >> 16; diff --git a/libavformat/rtp.c b/libavformat/rtp.c index ab0af11cbb..952296e379 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -108,7 +108,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i) if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) { if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || - !fmt->oformat->priv_class || + !fmt->oformat->priv_class || !fmt->priv_data || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) continue; /* G722 has 8000 as nominal rate even if the sample rate is 16000, |