Changeset fe540ae6 in ffmpeg

Timestamp:

Nov 22, 2013, 10:56:46 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1ddc849b

Parents:

7a88b7a9 (diff), f0259a58 (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> (11/22/13 10:55:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/22/13 10:56:46)

Message:

Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

• commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c': h264: check buffer size before accessing it

Conflicts:

libavcodec/h264.c

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

(No files)