diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-05-11 11:43:03 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-05-11 11:43:03 +0200 |
| commit | da4b044a4c350e307bf3e8ee5a211eda4a6ebac6 (patch) | |
| tree | 9dede96df2a85a33fb104b014c094a07309fba6a /lib/dvb/decoder.cpp | |
| parent | 6b924837dedad17ea56ca37075e760828469abcb (diff) | |
| parent | c3f2fa3d78531c2cb7de469d38e44c965102d454 (diff) | |
| download | enigma2-da4b044a4c350e307bf3e8ee5a211eda4a6ebac6.tar.gz enigma2-da4b044a4c350e307bf3e8ee5a211eda4a6ebac6.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/dvb/decoder.cpp')
| -rw-r--r-- | lib/dvb/decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 92652a4b..30a80d10 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1002,7 +1002,7 @@ int eTSMPEGDecoder::setState() } #endif - if (m_changed & changeState) + if (m_changed & (changeState|changeVideo|changeAudio)) { /* play, slowmotion, fast-forward */ int state_table[6][4] = @@ -1015,7 +1015,7 @@ int eTSMPEGDecoder::setState() /* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0} }; int *s = state_table[m_state]; - if (m_video) + if (m_changed & (changeState|changeVideo) && m_video) { m_video->setSlowMotion(s[1]); m_video->setFastForward(s[2]); @@ -1024,7 +1024,7 @@ int eTSMPEGDecoder::setState() else m_video->freeze(); } - if (m_audio) + if (m_changed & (changeState|changeAudio) && m_audio) { if (s[0]) m_audio->unfreeze(); |