Conflicts:
libspark/video.cpp
Origin commit data
------------------
Branch: master
Commit: 240eecde22
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
------------------
This commit was generated by Migit
this fixes video playback after audioplayer or upnp browser
Conflicts:
libspark/video.cpp
Origin commit data
------------------
Branch: master
Commit: c44c3994f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: da66fc3db5
Author: max_10 <max_10@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 4dc1171253
Author: max_10 <max_10@gmx.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 212a414a5e
Author: martii <m4rtii@gmx.de>
Date: 2014-04-03 (Thu, 03 Apr 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 687a244b61
Author: martii <m4rtii@gmx.de>
Date: 2014-01-20 (Mon, 20 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: cf8f9bc8af
Author: martii <m4rtii@gmx.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 950cb9323d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-11 (Sat, 11 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This reverts commit 3bc1035ecf.
Origin commit data
------------------
Branch: master
Commit: e44c547d78
Author: martii <m4rtii@gmx.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 8062db2387
Author: martii <m4rtii@gmx.de>
Date: 2013-10-20 (Sun, 20 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 848730507b
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
note that this does now work well at least on st7162 and thus is not
really tested.
Origin commit data
------------------
Branch: master
Commit: 642de31a8b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 28b21d2295
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 1756351a36
Author: martii <m4rtii@gmx.de>
Date: 2013-09-06 (Fri, 06 Sep 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 75e5268a3c
Author: martii <m4rtii@gmx.de>
Date: 2013-08-11 (Sun, 11 Aug 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 178fac0e8d
Author: martii <m4rtii@gmx.de>
Date: 2013-06-20 (Thu, 20 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 23bea61473
Author: martii <m4rtii@gmx.de>
Date: 2013-06-08 (Sat, 08 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: e10d6a5a18
Author: martii <m4rtii@gmx.de>
Date: 2013-06-07 (Fri, 07 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 4e9395f788
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 781cf7f389
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: e68c20dfbe
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 18b798bee2
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: f88d47b0f2
Author: martii <m4rtii@gmx.de>
Date: 2013-05-18 (Sat, 18 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 46754e01b1
Author: martii <m4rtii@gmx.de>
Date: 2013-03-22 (Fri, 22 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 94b05dbdc0
Author: martii <m4rtii@gmx.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 4b9d9271b6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 5d64ecf5fb
Author: martii <m4rtii@gmx.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 6b97269926
Author: graugans <k4230r6@gmail.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: aca3da1f29
Author: martii <m4rtii@gmx.de>
Date: 2012-10-27 (Sat, 27 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 260a6fcc2f
Author: martii <you@example.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: c2a9c1a6df
Author: martii <you@example.com>
Date: 2012-08-12 (Sun, 12 Aug 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 2ca16aedac
Author: martii <you@example.com>
Date: 2012-07-15 (Sun, 15 Jul 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 6e8bdf5c34
Author: martii <you@example.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this is a hack: the "mailbox" irq count does not increase if the
decoders are not decoding, so we use this to determine if the
video is in really playing.
Origin commit data
------------------
Branch: master
Commit: 2d52b68c2d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-05 (Thu, 05 Jul 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: ee3436d292
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-08 (Fri, 08 Jun 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
inspired by evolux, but much simpler
Origin commit data
------------------
Branch: master
Commit: 9e075bf190
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-08 (Fri, 08 Jun 2012)
------------------
This commit was generated by Migit
(how could this ever work? no idea). Found in evolux patches.
Origin commit data
------------------
Branch: master
Commit: f0f295efa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-08 (Fri, 08 Jun 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 75a4d2843b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-14 (Sat, 14 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 56874d9721
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-05 (Thu, 05 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 72089fe88d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 93bc0eec06
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 6bc5518847
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: cd90a23b46
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 86a5316bd7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
* don't clear stillpicture on radio channel change
* don't show stillpicture in standby
Origin commit data
------------------
Branch: master
Commit: 55d0d90b5b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
This commit was generated by Migit
we sometimes seem to get EBUSY when opening the video device
directly after close() - retry for half a second to get it opened
Origin commit data
------------------
Branch: master
Commit: 7bf0a98909
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
This commit was generated by Migit
rebuild the MPEG stillpicture if the source jpeg has changed
additionally check for zero sized m2v from broken ffmpeg versions
Origin commit data
------------------
Branch: master
Commit: ee1a408f9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
This commit was generated by Migit
There are a few glitches in the framebuffer driver we need to work
around. For now, let's:
* close and reopen the video device when going in / out of standby
* only enable HDMI when coming out of standby
Additionally, don't call Standby() when shutting down neutrino.
Origin commit data
------------------
Branch: master
Commit: fd5d65b07d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
This commit was generated by Migit
in order to not run into driver locking issues, stop video decoding
before setting the video system and restart afterwards
Origin commit data
------------------
Branch: master
Commit: 5cd42eb204
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: master
Commit: 6c5a60e128
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
