Changeset c0f2ad3d in ffmpeg

Timestamp:

Aug 8, 2013, 10:47:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e1a5ee25

Parents:

50b7ce12 (diff), 218d6844 (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> (08/08/13 10:38:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/08/13 10:47:05)

Message:

Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'

• commit '218d6844b37d339ffbf2044ad07d8be7767e2734': h264dsp: Factorize code into a new function, h264_find_start_code_candidate

Conflicts:

libavcodec/h264_parser.c

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

(No files)