projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9c01e5
)
Hopefully fix complete lack of audio.
author
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jul 2013 12:21:29 +0000
(13:21 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jul 2013 12:21:29 +0000
(13:21 +0100)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index 11cea8fb140dbcde881c23740a76bb2c3a41a72a..a67905daeedde17ebc590f6f130b9911508faa4c 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-383,7
+383,13
@@
FFmpegDecoder::decode_audio_packet ()
audio (silence, _audio_position);
}
}
-
+
+ int const data_size = av_samples_get_buffer_size (
+ 0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
+ );
+
+ audio (deinterleave_audio (_frame->data, data_size), _audio_position);
+
copy_packet.data += decode_result;
copy_packet.size -= decode_result;
}