diff options
| author | Michael Smith <msmith@rdio.com> | 2012-10-25 12:18:03 -0700 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-11-19 14:41:40 +0100 |
| commit | 21251233e056267e19696791dee25ec2b88740ae (patch) | |
| tree | 0e70117428a261e6f641588937717e2b4b57c8ac | |
| parent | 399460cf26a7135831fa30e762e303b1705748c0 (diff) | |
| download | gstreamer-plugins-good-21251233e056267e19696791dee25ec2b88740ae.tar.gz | |
qtdemux: read video format header fully (so we can find 'pasp' atoms) for more fourccs.
Fixes aspect ratio of prores files.
Conflicts:
gst/isomp4/qtdemux_fourcc.h
| -rw-r--r-- | gst/isomp4/qtdemux.c | 5 | ||||
| -rw-r--r-- | gst/isomp4/qtdemux_fourcc.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 36d2df647..eb6954714 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -4841,6 +4841,11 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, const guint8 * buffer, case FOURCC_MP4V: case FOURCC_fmp4: case FOURCC_FMP4: + case FOURCC_apcs: + case FOURCC_apch: + case FOURCC_apcn: + case FOURCC_apco: + case FOURCC_ap4h: { const guint8 *buf; guint32 version; diff --git a/gst/isomp4/qtdemux_fourcc.h b/gst/isomp4/qtdemux_fourcc.h index 716dfc98c..d747825ac 100644 --- a/gst/isomp4/qtdemux_fourcc.h +++ b/gst/isomp4/qtdemux_fourcc.h @@ -174,6 +174,10 @@ G_BEGIN_DECLS #define FOURCC_mp4s GST_MAKE_FOURCC('m','p','4','s') #define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a') #define FOURCC_apcs GST_MAKE_FOURCC('a','p','c','s') +#define FOURCC_apch GST_MAKE_FOURCC('a','p','c','h') +#define FOURCC_apcn GST_MAKE_FOURCC('a','p','c','n') +#define FOURCC_apco GST_MAKE_FOURCC('a','p','c','o') +#define FOURCC_ap4h GST_MAKE_FOURCC('a','p','4','h') /* SVQ3 fourcc */ #define FOURCC_SEQH GST_MAKE_FOURCC('S','E','Q','H') |