Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 2635002: fix parsing error at the end of stream (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: switching to checking packet->data Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 4092023906d4671527af8a83cb1617c44ada8ab3..c47250467f09df11d6978daf0a369f8a9206a953 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.";
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698