diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 20:05:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 20:23:58 +0100 |
| commit | 7830c882fa9327df81d7b36b627fc05a842bea2b (patch) | |
| tree | 2f977854a4fea4ce8d1ebb91c3e846122c76baed /libavformat | |
| parent | 93cf43ec3febaddfb34522bbcc2f04038c8e6e9e (diff) | |
| parent | 9fa75be96d0b4590c81ee5107e506fa182117a45 (diff) | |
| download | ffmpeg-7830c882fa9327df81d7b36b627fc05a842bea2b.tar.gz | |
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>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions