Changeset 17773f49 in ffmpeg

Timestamp:

Feb 24, 2015, 10:23:26 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cf958774

Parents:

0f8de2b5 (diff), 3567b91e (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 '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'

• commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15': rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:

libavformat/rtpdec_h264.c

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

(No files)