Changeset 621450e7 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

34c58618

Parents:

9b41bf5c (diff), 48183b3a (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> (02/21/15 11:25:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/21/15 11:25:09)

Message:

Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'

• commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5': rtpdec_h264: Generalize parse_sprop_parameter_sets

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

(No files)