Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
	libavformat/mpegts.c

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

...

This commit is contained in:

Michael Niedermayer

2013-12-12 20:05:52 +01:00

parent 93cf43ec3f 9fa75be96d

commit 7830c882fa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available