Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 22:09:00 +0000 (00:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 22:09:00 +0000 (00:09 +0200)
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nutenc.c

index 5db380f752078a2b30ef6f72a19eccf84eecc7f8,08907ef489856ad124c2722344e937df6d2de303..3424e26edb3bac4f5e33143b885dad7288d724b4
@@@ -1118,7 -906,10 +1118,8 @@@ static int nut_write_packet(AVFormatCon
              frame_code  = i;
          }
      }
 -
 -    if (frame_code < 0)
 -        return AVERROR_BUG;
 +    av_assert0(frame_code != -1);
      fc           = &nut->frame_code[frame_code];
      flags        = fc->flags;
      needed_flags = get_needed_flags(nut, nus, fc, pkt);