pthread_frame: ensure the threads don't run simultaneously with hwaccel

[ffmpeg] / libavcodec / h261_parser.c

diff --git a/libavcodec/h261_parser.c b/libavcodec/h261_parser.c
index 8a507ee8f27ef93105b7b08107e4ba67c395b5f1..59eed02f66dbee90da95d236db5b368c848d17dc 100644 (file)
--- a/libavcodec/h261_parser.c
+++ b/libavcodec/h261_parser.c
@@ -1,5 +1,5 @@
 /*
- * H261 parser
+ * H.261 parser
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * Copyright (c) 2004 Maarten Daniels
  *
@@ -22,43 +22,44 @@
 
 /**
  * @file
- * h261codec.
+ * H.261 parser
  */
 
 #include "parser.h"
 
-
-static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const uint8_t *buf, int buf_size){
+static int h261_find_frame_end(ParseContext *pc, AVCodecContext *avctx,
+                               const uint8_t *buf, int buf_size)
+{
     int vop_found, i, j;
     uint32_t state;
 
-    vop_found= pc->frame_start_found;
-    state= pc->state;
+    vop_found = pc->frame_start_found;
+    state     = pc->state;
 
-    for(i=0; i<buf_size && !vop_found; i++){
-        state= (state<<8) | buf[i];
-        for(j=0; j<8; j++){
-            if(((state>>j)&0xFFFFF0) == 0x000100){
-                vop_found=1;
+    for (i = 0; i < buf_size && !vop_found; i++) {
+        state = (state << 8) | buf[i];
+        for (j = 0; j < 8; j++) {
+            if (((state >> j) & 0xFFFFF0) == 0x000100) {
+                vop_found = 1;
                 break;
             }
         }
     }
-    if(vop_found){
-        for(; i<buf_size; i++){
-            state= (state<<8) | buf[i];
-            for(j=0; j<8; j++){
-                if(((state>>j)&0xFFFFF0) == 0x000100){
-                    pc->frame_start_found=0;
-                    pc->state= (state>>(3*8))+0xFF00;
-                    return i-2;
+    if (vop_found) {
+        for (; i < buf_size; i++) {
+            state = (state << 8) | buf[i];
+            for (j = 0; j < 8; j++) {
+                if (((state >> j) & 0xFFFFF0) == 0x000100) {
+                    pc->frame_start_found = 0;
+                    pc->state             = (state >> (3 * 8)) + 0xFF00;
+                    return i - 2;
                 }
             }
         }
     }
 
-    pc->frame_start_found= vop_found;
-    pc->state= state;
+    pc->frame_start_found = vop_found;
+    pc->state             = state;
     return END_NOT_FOUND;
 }
 
@@ -70,13 +71,13 @@ static int h261_parse(AVCodecParserContext *s,
     ParseContext *pc = s->priv_data;
     int next;
 
-    next= h261_find_frame_end(pc,avctx, buf, buf_size);
+    next = h261_find_frame_end(pc, avctx, buf, buf_size);
     if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
-        *poutbuf = NULL;
+        *poutbuf      = NULL;
         *poutbuf_size = 0;
         return buf_size;
     }
-    *poutbuf = buf;
+    *poutbuf      = buf;
     *poutbuf_size = buf_size;
     return next;
 }