diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-03 09:51:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-03 09:51:28 +0000 |
| commit | f4c001bc77d482e4448f4e719db4a64f389daf91 (patch) | |
| tree | 3a98d90cd2598939a181aa664722b9820b9d4492 /src/lib/ffmpeg_decoder.cc | |
| parent | e1a7890c6cee31ebbd55e5209cd14bb3b9b93bf0 (diff) | |
Fix mix-merge of previous.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index d1b65cbc2..a96a4fb40 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -341,9 +341,6 @@ FFmpegDecoder::decode_audio_packet () Returning from the method here caused mantis #352. */ - - shared_ptr<const Film> film = _film.lock (); - assert (film); LOG_WARNING ("avcodec_decode_audio4 failed (%1)", decode_result); /* Fudge decode_result so that we come out of the while loop when |