projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various fix-ups.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index a197a7490b4b2b7f7f36d5fa8be29fc04c36d99a..9cd10ad615c8344333466593b239aa0166f3c3fa 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-788,7
+788,7
@@
FilmEditor::setup_frame_rate_description ()
if (_film->video_frame_rate()) {
d << std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description);
#ifdef HAVE_SWRESAMPLE
if (_film->video_frame_rate()) {
d << std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description);
#ifdef HAVE_SWRESAMPLE
- if (_film->audio_frame_rate() != _film->target_audio_sample_rate ()) {
+ if (_film->audio_frame_rate()
&& _film->audio_frame_rate()
!= _film->target_audio_sample_rate ()) {
d << wxString::Format (
_("Audio will be resampled from %dHz to %dHz\n"),
_film->audio_frame_rate(),
d << wxString::Format (
_("Audio will be resampled from %dHz to %dHz\n"),
_film->audio_frame_rate(),