demux duplicate data the same way as mp3 does.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
@@ skipping 477 matching lines @@
   }
 
   // Queue the packet with the appropriate stream.
   // TODO(scherkus): should we post this back to the pipeline thread?  I'm
   // worried about downstream filters (i.e., decoders) executing on this
   // thread.
   DCHECK(packet->stream_index >= 0);
   DCHECK(packet->stream_index < static_cast<int>(packet_streams_.size()));
   FFmpegDemuxerStream* demuxer_stream = packet_streams_[packet->stream_index];
   if (demuxer_stream) {
-    // Duplicate the entire packet if we're dealing with MP3 due to an issue
-    // where previously demuxed packets can become corrupted by simply demuxing
-    // additional packets.
-    //
-    // TODO(scherkus): fix the MP3 packet copying hack.
-    if (demuxer_stream->GetAVStream()->codec->codec_id == CODEC_ID_MP3) {
-      scoped_ptr<AVPacket> clone(ClonePacket(packet.get()));
-      if (!clone.get()) {
-        NOTREACHED();
-        return;
-      }
-      // Free FFmpeg-allocated memory and swap original packet into |clone| so
-      // that it gets deleted as |clone| goes out of scope.
-      av_free_packet(packet.get());
-      packet.swap(clone);
+    // Duplicate the entire packet to avoid aliasing.
+    // Directly affects MP3, but do all formats to be safe.
+    scoped_ptr<AVPacket> clone(ClonePacket(packet.get()));
+    if (!clone.get()) {
+      NOTREACHED();
+      return;
     }
+    // Free FFmpeg-allocated memory and swap original packet into |clone| so
+    // that it gets deleted as |clone| goes out of scope.
+    av_free_packet(packet.get());
+    packet.swap(clone);
 
     // Queue the packet with the appropriate stream.  The stream takes
     // ownership of the AVPacket.
     current_timestamp_ = demuxer_stream->EnqueuePacket(packet.release());
   } else {
     av_free_packet(packet.get());
   }
 
   // Create a loop by posting another task.  This allows seek and message loop
   // quit tasks to get processed.
@@ skipping 57 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media