• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0a23067a
    Michael Niedermayer authored
    * qatar/master:
      mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
      mpeg124: use sign_extend() function
      ac3dec: use get_sbits() instead of manually sign-extending
      4xm: fix signed overflow
      wmavoice: fix a signed overflow
      mpegvideo_enc: fix a signed overflow
      crc: fix signed overflow
      fate: run avconv with -nostats flag
      avtools: add -v as alias for -loglevel
      avconv: always print stats with AV_LOG_INFO
      doc/avconv: add forgotten output/per-stream info to -filter
      avconv: add -stats option to enable/disable printing encoding progress
      avconv: in output_packet() don't set decoded_data_size for video.
      avconv: remove pointless always true condition
      avconv: factorize common code in transcode_init()
      zmbv: remove memcpy() of decoded frame
      mpeg12enc: use sign_extend() function
      h264pred: use unsigned types for pixel values, fix signed overflows
      h264: fix signed overflows in x*0x01010101 expressions
      h264pred: remove unused variables
    
    Conflicts:
    	avconv.c
    	tests/fate-run.sh
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0a23067a
mpeg12enc.c 36.4 KB