Changeset 5d6a40bc in ffmpeg

Timestamp:

Apr 8, 2012, 6:55:11 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c311afca

Parents:

4f043c8a (diff), 9294f538 (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> (04/08/12 18:55:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/08/12 18:55:11)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: rtsp: Don't use av_malloc(0) if there are no streams rtsp: Don't use uninitialized data if there are no streams vaapi: mpeg2: fix slice_vertical_position calculation. hwaccel: mpeg2: decode first field, if requested. cosmetics: Fix indentation rtsp: Don't expose the MS-RTSP RTX data stream to the caller

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)