Changeset ffd77f94 in ffmpeg

Timestamp:

Mar 24, 2014, 12:33:02 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fa25c4c4

Parents:

0626211b (diff), f51d0f39 (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/24/14 00:24:55)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/24/14 00:33:02)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: h264: Split h264 slice decoding from nal decoding

Conflicts:

libavcodec/Makefile
libavcodec/h264.c

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

(No files)