@@ -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

@@ -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;

@@ -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;

@@ -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,