summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2005-05-05 11:13:44 +0000
committerEdward Hervey <bilboed@bilboed.com>2005-05-05 11:13:44 +0000
commit0a6d60fb2008570a8797946cc71beb16dcb70a91 (patch)
tree28f8966d1a44163374819f9a6d2eca70c7f724e4
parent8cc6c31580b82387a1ada6a9785ddf8f6e4c9789 (diff)
downloadgst-plugins-bad-0a6d60fb2008570a8797946cc71beb16dcb70a91.tar.gz
gst-plugins-bad-0a6d60fb2008570a8797946cc71beb16dcb70a91.tar.bz2
gst-plugins-bad-0a6d60fb2008570a8797946cc71beb16dcb70a91.zip
ext/faad/gstfaad.c: Reverting previous patch, blame borked gentoo patches on faad2-2.0-r5 :(
Original commit message from CVS: * ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain): Reverting previous patch, blame borked gentoo patches on faad2-2.0-r5 :(
-rw-r--r--ChangeLog5
-rw-r--r--ext/faad/gstfaad.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 81904cb9..3ee51fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2005-05-05 Edward Hervey <bilboed@bilboed.com>
* ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain):
+ Reverting previous patch, blame borked gentoo patches on faad2-2.0-r5 :(
+
+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.
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index b75c1341..cb2c6611 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"))) {
- guint samplerate;
+ gulong 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) {
- guint samplerate;
+ gulong samplerate;
guchar channels;
glong init_res;