Changeset 4667116c in ffmpeg

Timestamp:

Jun 20, 2014, 9:18:45 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1caedf62

Parents:

fe43facd (diff), ca1e36a8 (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 'ca1e36a8e4cd416142487071dbca734567bdaddf'

• commit 'ca1e36a8e4cd416142487071dbca734567bdaddf': h264: fix build when error resilience is disabled

Conflicts:

libavcodec/h264_picture.c

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

(No files)