Michael Niedermayer 6999f8bcf5 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>

2012-03-27 11:59:39 +02:00

49 KiB

Raw Blame History

View Raw