Changeset af2bb83d in ffmpeg

Timestamp:

Sep 24, 2013, 1:30:21 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d195e6e4

Parents:

9c2e31c (diff), edaba180 (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> (09/24/13 13:23:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/24/13 13:30:21)

Message:

Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'

• commit 'edaba18021e4793116f0f266e65077578a5e742e': h264: log extradata skip only for non-ignored NALs

Conflicts:

libavcodec/h264.c

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

(No files)