summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2005-05-05 10:22:16 +0000
committerEdward Hervey <bilboed@bilboed.com>2005-05-05 10:22:16 +0000
commit8cc6c31580b82387a1ada6a9785ddf8f6e4c9789 (patch)
tree97872ad65333f737013e3a0ae9da68859455c4d9
parentc17c5c2af1dc81c69bd53d373c97350a43cfb44e (diff)
downloadgst-plugins-bad-8cc6c31580b82387a1ada6a9785ddf8f6e4c9789.tar.gz
gst-plugins-bad-8cc6c31580b82387a1ada6a9785ddf8f6e4c9789.tar.bz2
gst-plugins-bad-8cc6c31580b82387a1ada6a9785ddf8f6e4c9789.zip
ext/faad/gstfaad.c: faacDecInit[2]() uses (unsigned int *) and not (unsigned long *) for the samplerate argument.
Original commit message from CVS: * ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain): faacDecInit[2]() uses (unsigned int *) and not (unsigned long *) for the samplerate argument.
-rw-r--r--ChangeLog6
-rw-r--r--ext/faad/gstfaad.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fb8fe64b..81904cb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-05 Edward Hervey <bilboed@bilboed.com>
+
+ * ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain):
+ faacDecInit[2]() uses (unsigned int *) and not (unsigned long *) for
+ the samplerate argument.
+
2005-05-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/mad/gstmad.c: (gst_mad_update_info):
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index cb2c6611..b75c1341 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -301,7 +301,7 @@ gst_faad_sinkconnect (GstPad * pad, const GstCaps * caps)
faad->packetised = FALSE;
if ((value = gst_structure_get_value (str, "codec_data"))) {
- gulong samplerate;
+ guint samplerate;
guchar channels;
/* We have codec data, means packetised stream */
@@ -674,7 +674,7 @@ gst_faad_chain (GstPad * pad, GstData * data)
/* init if not already done during capsnego */
if (!faad->init) {
- gulong samplerate;
+ guint samplerate;
guchar channels;
glong init_res;