Changeset 35a788d9 in ffmpeg

Timestamp:

Mar 21, 2015, 2:27:29 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

739edc1a

Parents:

cc2cfdc (diff), b063582e (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/21/15 14:25:31)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/21/15 14:27:29)

Message:

Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'

• commit 'b063582e0c4f775a8ba377488bd085595e0e7fae': h264: move intra_pcm_ptr into the per-slice context

Conflicts:

libavcodec/h264.h

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

(No files)