Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)
* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/flvdec.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/vc1dec.c
libavformat/rtpdec.c

Simple merge
Simple merge
@@@ -2373,11 -2356,10 +2373,11 @@@ static int decode_slice_header(H264Cont
      MpegEncContext *const s0 = &h0->s;
      unsigned int first_mb_in_slice;
      unsigned int pps_id;
 -    int num_ref_idx_active_override_flag, max_refs;
 +    int num_ref_idx_active_override_flag;
      unsigned int slice_type, tmp, i, j;
      int default_ref_list_done = 0;
-     int last_pic_structure, last_pic_dropable;
+     int last_pic_structure, last_pic_droppable;
 +    int must_reinit;
  
      /* FIXME: 2tap qpel isn't implemented for high bit depth. */
      if ((s->avctx->flags2 & CODEC_FLAG2_FAST) &&
Simple merge
@@@ -341,14 -339,11 +341,14 @@@ typedef struct MpegEncContext 
      int *lambda_table;
      int adaptive_quant;         ///< use adaptive quantization
      int dquant;                 ///< qscale difference to prev qscale
 +    int closed_gop;             ///< MPEG1/2 GOP is closed
      int pict_type;              ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ...
 +    int vbv_delay;
      int last_pict_type; //FIXME removes
      int last_non_b_pict_type;   ///< used for mpeg4 gmc b-frames & ratecontrol
-     int dropable;
+     int droppable;
      int frame_rate_index;
 +    AVRational mpeg2_frame_rate_ext;
      int last_lambda_for[5];     ///< last lambda for a specific pict type
      int skipdct;                ///< skip dct and code zero residual
  
Simple merge
@@@ -546,18 -551,18 +551,19 @@@ static int rtp_parse_packet_internal(RT
          rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
                               s->st, pkt, &timestamp, buf, len, flags);
      } else {
-         // at this point, the RTP header has been stripped;  This is ASSUMING that there is only 1 CSRC, which in't wise.
-         switch(st->codec->codec_id) {
+         /* At this point, the RTP header has been stripped;
+          * This is ASSUMING that there is only 1 CSRC, which isn't wise. */
+         switch (st->codec->codec_id) {
          case AV_CODEC_ID_MP2:
          case AV_CODEC_ID_MP3:
-             /* better than nothing: skip mpeg audio RTP header */
+             /* better than nothing: skip MPEG audio RTP header */
              if (len <= 4)
                  return -1;
-             h = AV_RB32(buf);
+             h    = AV_RB32(buf);
              len -= 4;
              buf += 4;
 -            av_new_packet(pkt, len);
 +            if (av_new_packet(pkt, len) < 0)
 +                return AVERROR(ENOMEM);
              memcpy(pkt->data, buf, len);
              break;
          case AV_CODEC_ID_MPEG1VIDEO: