projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1a7890
)
Fix mix-merge of previous.
author
Carl Hetherington
<cth@carlh.net>
Mon, 3 Nov 2014 09:51:28 +0000
(09:51 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 3 Nov 2014 09:51:28 +0000
(09:51 +0000)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index d1b65cbc2846b56014f8dbc6a1bd108ab9408501..a96a4fb408df49dacaf79387365f4131db543d98 100644
(file)
--- 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