Changeset 7830c882 in ffmpeg

Timestamp:

Dec 12, 2013, 7:23:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3dbf9afe

Parents:

93cf43ec (diff), 9fa75be9 (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> (12/12/13 19:05:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/12/13 19:23:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: mpegts: add HEVC registration descriptor

Conflicts:

libavformat/mpegts.c

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

(No files)