Changeset 7fd732b7 in ffmpeg

Timestamp:

Feb 21, 2015, 11:44:09 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a10529a3

Parents:

34c58618 (diff), 16163e6b (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.

Message:

Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'

• commit '16163e6bf2d446c06d4dd053c0852074bb50508d': rtpdec_h264: Fix nal type counting after refactoring

Conflicts:

libavformat/rtpdec_h264.c

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

(No files)