[FFmpeg-soc] [soc]: r246 - in dirac: dirac_parser.c ffmpeg.diff

[marco]

Author: marco
Date: Sun Jun 10 17:11:15 2007
New Revision: 246

Log:
Indentation fixes and cleanups.


Modified:
   dirac/dirac_parser.c
   dirac/ffmpeg.diff

Modified: dirac/dirac_parser.c
==============================================================================
--- dirac/dirac_parser.c	(original)
+++ dirac/dirac_parser.c	Sun Jun 10 17:11:15 2007
@@ -20,6 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file dirac_parser.c
+ * Dirac Parser
+ * @author Marco Gerards <marco at gnu.org>
+ */
+
 #include "parser.h"
 
 #define DEBUG 1
@@ -28,7 +34,8 @@
  * finds the end of the current frame in the bitstream.
  * @return the position of the first byte of the next frame, or -1
  */
-static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
+static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
+{
      uint32_t state;
 
     /* Check if there is enough room for a Parse Info Header,
@@ -60,18 +67,17 @@ static int find_frame_end(ParseContext *
     return END_NOT_FOUND;
 }
 
-static int dirac_parse(AVCodecParserContext *s,
-                           AVCodecContext *avctx,
-                           const uint8_t **poutbuf, int *poutbuf_size,
-                           const uint8_t *buf, int buf_size)
+static int dirac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+                       const uint8_t **poutbuf, int *poutbuf_size,
+                       const uint8_t *buf, int buf_size)
 {
     ParseContext *pc = s->priv_data;
     int next;
 
     if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
-        next= buf_size;
+        next = buf_size;
     }else{
-        next= find_frame_end(pc, buf, buf_size);
+        next = find_frame_end(pc, buf, buf_size);
 
         if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
             *poutbuf = NULL;

Modified: dirac/ffmpeg.diff
==============================================================================
--- dirac/ffmpeg.diff	(original)
+++ dirac/ffmpeg.diff	Sun Jun 10 17:11:15 2007
@@ -50,22 +50,22 @@ Index: libavcodec/avcodec.h
  
      /* various PCM "codecs" */
      CODEC_ID_PCM_S16LE= 0x10000,
-@@ -2192,6 +2193,7 @@
- extern AVCodec asv2_encoder;
- extern AVCodec bmp_encoder;
- extern AVCodec dvvideo_encoder;
+@@ -2254,6 +2255,7 @@
+ extern AVCodec cscd_decoder;
+ extern AVCodec cyuv_decoder;
+ extern AVCodec dca_decoder;
 +extern AVCodec dirac_decoder;
- extern AVCodec ffv1_encoder;
- extern AVCodec ffvhuff_encoder;
- extern AVCodec flac_encoder;
-@@ -3016,6 +3018,7 @@
- extern AVCodecParser aac_parser;
+ extern AVCodec dnxhd_decoder;
+ extern AVCodec dsicinaudio_decoder;
+ extern AVCodec dsicinvideo_decoder;
+@@ -3017,6 +3019,7 @@
  extern AVCodecParser ac3_parser;
  extern AVCodecParser cavsvideo_parser;
-+extern AVCodecParser dirac_parser;
  extern AVCodecParser dca_parser;
++extern AVCodecParser dirac_parser;
  extern AVCodecParser dvbsub_parser;
  extern AVCodecParser dvdsub_parser;
+ extern AVCodecParser h261_parser;
 Index: libavformat/Makefile
 ===================================================================
 --- libavformat/Makefile	(revision 9271)