summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 23:01:33 +0000
committerwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 23:01:33 +0000
commitbd205617c4f7eca4bb28c0343ed2f071189393c3 (patch)
tree063dc263480b1143246a9970a14a02bc1b33c1aa
parent93a58bf71562d84d4c8d6b05c18c8ffdfbdeada1 (diff)
downloadchromium_src-bd205617c4f7eca4bb28c0343ed2f071189393c3.zip
chromium_src-bd205617c4f7eca4bb28c0343ed2f071189393c3.tar.gz
chromium_src-bd205617c4f7eca4bb28c0343ed2f071189393c3.tar.bz2
fix parsing error at the end of stream
Review URL: http://codereview.chromium.org/2635002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48988 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/filters/ffmpeg_demuxer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 4092023..c472504 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -117,7 +117,7 @@ base::TimeDelta FFmpegDemuxerStream::EnqueuePacket(AVPacket* packet) {
}
// Convert if the packet if there is bitstream filter.
- if (bitstream_converter_.get() &&
+ if (packet->data && bitstream_converter_.get() &&
!bitstream_converter_->ConvertPacket(packet)) {
LOG(ERROR) << "Format converstion failed.";
}