From 99edf9d9ed514795238b239d3e1004fac3afa1c3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 8 Apr 2017 19:05:42 +0200 Subject: [PATCH] Remove another overzealous assert. Fixes playing "swinging.mp4" from our demo video package. --- src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp index 2b219f93c8..7540491597 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp @@ -1110,7 +1110,6 @@ status_t AVCodecDecoder::_DecodeSomeAudioFramesIntoEmptyDecodedDataBuffer() { assert(fDecodedDataBufferSize == 0); - assert(fTempPacket.size > 0); memset(fDecodedDataBuffer, 0, sizeof(AVFrame)); av_frame_unref(fDecodedDataBuffer); @@ -1231,15 +1230,6 @@ AVCodecDecoder::_UpdateMediaHeaderForAudioFrame() status_t AVCodecDecoder::_DecodeNextVideoFrame() { -#if 0 - // Well, I heard this was not supposed to happen, but it does - // (for example with http://thud.us/videos/misc/xvid-samples/flyby-divx.avi - // see #11409). Since that video otherwise plays fine when removing the - // assert, I'm assuming we are being overcautious here and commenting it - // out. - assert(fTempPacket.size >= 0); -#endif - while (true) { status_t loadingChunkStatus = _LoadNextChunkIfNeededAndAssignStartTime();