Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Mar 2012 09:52:08 +0000 (11:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Mar 2012 09:59:39 +0000 (11:59 +0200)
commit6999f8bcf56bb167124bf85bdaa89090acdd5d9c
tree5bfb541bec48db787901f2441bd887d3629737ea
parentab31db06103c6ac0c1bd1f9fdfa93220d8801e19
parent904100e5fc13dacc954b1d093bf87bc44f4e7a7b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv34.c
libavcodec/targa.c
libavcodec/vc1.c
libavcodec/vc1data.c
libavcodec/vc1dec.c
libavformat/avformat.h
libavformat/mpegts.c
libavformat/utils.c