Changeset de7b50e9 in ffmpeg

Timestamp:

Feb 20, 2014, 11:20:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0ad8f73f

Parents:

f2387152 (diff), f777504f (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> (02/20/14 23:19:07)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/20/14 23:20:55)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: h264: Lower bound check for slice offsets

Conflicts:

libavcodec/h264.c

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

(No files)