From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 12 Dec 2013 19:05:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-6.0-r1~8361
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7830c882fa9327df81d7b36b627fc05a842bea2b;p=android-x86%2Fexternal-ffmpeg.git

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>
---

7830c882fa9327df81d7b36b627fc05a842bea2b