mpegvideo_enc: Check AVCodecContext allocation

[ffmpeg] / libavcodec / parser.c

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index c6ceeb6d2de00e229e8dc63d7b5e67da54bc339d..4404d97d67f7cb942302178831f639a34d502ed4 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -29,7 +29,7 @@
 
 static AVCodecParser *av_first_parser = NULL;
 
-AVCodecParser *av_parser_next(AVCodecParser *p)
+AVCodecParser *av_parser_next(const AVCodecParser *p)
 {
     if (p)
         return p->next;
@@ -89,6 +89,8 @@ found:
     s->dts_sync_point       = INT_MIN;
     s->dts_ref_dts_delta    = INT_MIN;
     s->pts_dts_delta        = INT_MIN;
+    s->format               = -1;
+
     return s;
 }
 
@@ -176,8 +178,8 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
                      const uint8_t *buf, int buf_size, int keyframe)
 {
     if (s && s->parser->split) {
-        if ((avctx->flags  & CODEC_FLAG_GLOBAL_HEADER) ||
-            (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) {
+        if (avctx->flags  & CODEC_FLAG_GLOBAL_HEADER ||
+            avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER) {
             int i = s->parser->split(avctx, buf, buf_size);
             buf      += i;
             buf_size -= i;
@@ -188,14 +190,16 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
     *poutbuf      = (uint8_t *) buf;
     *poutbuf_size = buf_size;
     if (avctx->extradata) {
-        if ((keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))) {
+        if (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) {
             int size = buf_size + avctx->extradata_size;
 
             *poutbuf_size = size;
             *poutbuf      = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+            if (!*poutbuf)
+                return AVERROR(ENOMEM);
 
             memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
-            memcpy((*poutbuf) + avctx->extradata_size, buf,
+            memcpy(*poutbuf + avctx->extradata_size, buf,
                    buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
             return 1;
         }
@@ -237,7 +241,7 @@ int ff_combine_frame(ParseContext *pc, int next,
     /* copy into buffer end return */
     if (next == END_NOT_FOUND) {
         void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
-                                           (*buf_size) + pc->index +
+                                           *buf_size + pc->index +
                                            FF_INPUT_BUFFER_PADDING_SIZE);
 
         if (!new_buffer)
@@ -269,8 +273,8 @@ int ff_combine_frame(ParseContext *pc, int next,
 
     /* store overread bytes */
     for (; next < 0; next++) {
-        pc->state   = (pc->state   << 8) | pc->buffer[pc->last_index + next];
-        pc->state64 = (pc->state64 << 8) | pc->buffer[pc->last_index + next];
+        pc->state   = pc->state   << 8 | pc->buffer[pc->last_index + next];
+        pc->state64 = pc->state64 << 8 | pc->buffer[pc->last_index + next];
         pc->overread++;
     }
 
@@ -297,7 +301,7 @@ int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
     uint32_t state = -1;
 
     for (i = 0; i < buf_size; i++) {
-        state = (state << 8) | buf[i];
+        state = state << 8 | buf[i];
         if (state == 0x1B3 || state == 0x1B6)
             return i - 3;
     }