Changeset 533bc4c0 in ffmpeg

Timestamp:

Mar 17, 2014, 4:08:46 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8ef9dcf1

Parents:

3dab9e80 (diff), d66e305b (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> (03/17/14 03:59:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 04:08:46)

Message:

Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'

• commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture

Conflicts:

libavcodec/error_resilience.c
libavcodec/h264.c

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

(No files)