diff --git a/ChangeLog b/ChangeLog
index ae6f9473a..944937914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-12-03  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mkvmerge: bug fix: The AAC packetizer was not working if packets
+	were being read from a raw AAC file (it worked fine from MP4 and
+	Matroska files).
+
 	* mkvmerge: bug fix: Avoid deadlocks when parsing broken SPU
 	packets from VobSubs.
 
diff --git a/src/output/p_aac.cpp b/src/output/p_aac.cpp
index 33a513b53..26b7150c8 100644
--- a/src/output/p_aac.cpp
+++ b/src/output/p_aac.cpp
@@ -64,11 +64,8 @@ unsigned char *aac_packetizer_c::get_aac_packet(unsigned long *header,
   unsigned char *buf, *src, *packet_buffer;
   double pims;
 
-  buf = NULL;
   packet_buffer = byte_buffer.get_buffer();
   size = byte_buffer.get_size();
-  if (buf == NULL)
-    return NULL;
   pos = find_aac_header(packet_buffer, size, aacheader, emphasis_present);
   if (pos < 0)
     return NULL;