Changeset 29f9d82 in ffmpeg

Timestamp:

Feb 24, 2015, 10:03:12 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f8de2b5

Parents:

df388836 (diff), 8633fb47 (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 '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

• commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0': rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Conflicts:

libavformat/rtpdec_h264.c

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

(No files)