Changeset 673a2b38 in ffmpeg

Timestamp:

Jul 11, 2014, 9:56:37 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aa56c37c

Parents:

f351afb (diff), 1493b237 (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> (07/11/14 09:54:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/11/14 09:56:37)

Message:

Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'

• commit '1493b237bd3f9707319ac58d315ce45312900c10': hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:

libavcodec/hevc.c

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

(No files)