Changeset 6999f8bc in ffmpeg

Timestamp:

Mar 27, 2012, 9:59:39 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dcd013a5

Parents:

ab31db06 (diff), 904100e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/27/12 09:52:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/27/12 09:59:39)

Message:

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>

(No files)