Changeset 0f8de2b5 in ffmpeg

Timestamp:
Feb 24, 2015, 10:16:46 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
17773f49
Parents:
29f9d82 (diff), f3449062 (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 'f3449062a8d100ac4f703647336c32b126aa99f1'

Conflicts:

libavformat/rtpdec_hevc.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.