Simplify H.264 decode_cabac_mb_cbp_luma(), giving a ~0.5% speedup.

[ffmpeg] / libavcodec / roqvideo.h

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index b405dfdf919c04b35fd16904f4b91e87fa8b65f8..202f32a39471664c0dc50c71127daf9d245fdc21 100644 (file)
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003 the ffmpeg project
+ * Copyright (C) 2003 Mike Melanson
+ * Copyright (C) 2003 Dr. Tim Ferguson
  *
  * This file is part of FFmpeg.
  *
@@ -16,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef AVCODEC_ROQVIDEO_H
@@ -27,12 +27,12 @@
 #include "random.h"
 
 typedef struct {
-  unsigned char y[4];
-  unsigned char u, v;
+    unsigned char y[4];
+    unsigned char u, v;
 } roq_cell;
 
 typedef struct {
-  int idx[4];
+    int idx[4];
 } roq_qcell;
 
 typedef struct {
@@ -47,8 +47,6 @@ typedef struct RoqContext {
     AVFrame *last_frame;
     AVFrame *current_frame;
     int first_frame;
-    int y_stride;
-    int c_stride;
 
     roq_cell cb2x2[256];
     roq_qcell cb4x4[256];