Changeset f2cb3b36 in ffmpeg

Timestamp:

Jan 18, 2014, 8:44:18 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

32961030

Parents:

357a733f (diff), 7f0e81db (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> (01/18/14 20:37:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/18/14 20:44:18)

Message:

Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'

• commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f': h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:

libavcodec/h264.c

See: d6a33f5d20b6ef2eae2cbb959b001cb125a564b7
See: 2005fddcbb4e18e8f7c34326e40609e4a2d83c31
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)