summaryrefslogtreecommitdiffstats
path: root/gst/qtmux/atoms.c
diff options
context:
space:
mode:
authorDave Robillard <dave@drobilla.net>2009-06-03 16:37:53 -0400
committerDave Robillard <dave@drobilla.net>2009-06-03 16:37:53 -0400
commit7f3bcd484b465d8216ac419754450adf07e9b0d2 (patch)
tree5320e188d7719d8fba29beaf7da8f6f73e51e4e8 /gst/qtmux/atoms.c
parentb19dd5920605c0036dacf19591a6feca7a736a50 (diff)
parente14bfea0c44aafba65239cbff9c6a4a93e0ae41a (diff)
downloadgst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.tar.gz
gst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.tar.bz2
gst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.zip
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'gst/qtmux/atoms.c')
-rw-r--r--gst/qtmux/atoms.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gst/qtmux/atoms.c b/gst/qtmux/atoms.c
index a5d8fe38..47db40ce 100644
--- a/gst/qtmux/atoms.c
+++ b/gst/qtmux/atoms.c
@@ -2783,6 +2783,9 @@ atom_trak_set_audio_type (AtomTRAK * trak, AtomsContext * context,
atom_trak_set_audio_commons (trak, context, scale);
ste = atom_trak_add_audio_entry (trak, context, entry->fourcc);
+ trak->is_video = FALSE;
+ trak->is_h264 = FALSE;
+
ste->version = entry->version;
ste->compression_id = entry->compression_id;
ste->sample_size = entry->sample_size;
@@ -2811,6 +2814,9 @@ atom_trak_set_video_type (AtomTRAK * trak, AtomsContext * context,
entry->height);
ste = atom_trak_add_video_entry (trak, context, entry->fourcc);
+ trak->is_video = TRUE;
+ trak->is_h264 = (entry->fourcc == FOURCC_avc1);
+
ste->width = entry->width;
ste->height = entry->height;
ste->depth = entry->depth;