Changeset e9d646f4 in ffmpeg

Timestamp:

May 30, 2015, 7:33:00 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c41e0aed

Parents:

7d1cfbbc (diff), 0181ae9a (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 '0181ae9af2de1526464d23209b82e6674d362f5d'

• commit '0181ae9af2de1526464d23209b82e6674d362f5d': h264: Make sure reinit failures mark the context as not initialized

Conflicts:

libavcodec/h264_slice.c

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

(No files)