Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:06:54 +0000 (14:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:07:19 +0000 (14:07 +0100)
* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
  h264: drop outdated comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c
libavcodec/h264.h

Simple merge
@@@ -383,16 -354,9 +383,12 @@@ typedef struct H264Context 
      ptrdiff_t mb_linesize;  ///< may be equal to s->linesize or s->linesize * 2, for mbaff
      ptrdiff_t mb_uvlinesize;
  
 +    unsigned current_sps_id; ///< id of the current SPS
      SPS sps; ///< current sps
-     /**
-      * current pps
-      */
-     PPS pps; // FIXME move to Picture perhaps? (->no) do we need that?
+     PPS pps; ///< current pps
  
 +    int au_pps_id; ///< pps_id of current access unit
 +
      uint32_t dequant4_buffer[6][QP_MAX_NUM + 1][16]; // FIXME should these be moved down?
      uint32_t dequant8_buffer[6][QP_MAX_NUM + 1][64];
      uint32_t(*dequant4_coeff[6])[16];