Changeset 028f8c3 in ffmpeg

Timestamp:

Sep 17, 2013, 2:26:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8fc441ce

Parents:

8d0b899e (diff), f875a732 (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.

Message:

Merge commit 'f875a732e36786d49f3650e3235272891a820600'

• commit 'f875a732e36786d49f3650e3235272891a820600': mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:

libavcodec/mpeg4videodec.c

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

(No files)