Remove some QObjectt:: and replace them with a local class
Merge branch 'master' of code.mythtv.org:mythtv
Fixes Visual Studio compilation
Update ABI version

Probably not necessary, but just in case
Version 4.8.0 is required following 9d670e8f4a46cd18d7a52352141f99e8dd380157
Fix compilation warning.

Two issues at hand:
When doing PopScreen(false, false), do you call PopScreen(screen, bool) where screen = 0 or PopScreen(bool, bool)
Don't make PopScreen(void) virtual, so no virtual function is hiding the other.

Equivalent functionality is available via PopScreen(GetTopScreen)
Update ABI number following 474cdb1b88b606c729bb560a2b9065e99d15d7db
remove unused variable after last usage got removed in 4fc35ec91d

Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Provide identical functionality to previous MythScreenStack::PopScreen() using MythScreenStack::PopScreen(NULL)
Update all use of PopScreen(bool, bool) following 474cdb1b88b606c729bb560a2b9065e99d15d7db
MythScreenStack::Pop(void) serves no purpose any longer. Remove it
Bump ABI
swscale/input: fix 16bit gbrp input

Fixes Ticket2793

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4b55bbb6f8ba055bba1493f6872792503e47563)

Conflicts:
	libswscale/input.c
Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
mpeg12: Ignore slice threading if hwaccel is active

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 93a51984a27f3ba84d4e6f13d0c704ee9891603e)

Conflicts:
	libavcodec/mpeg12dec.c
Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
avformat/dtsdec: Improve probe, reject things looking like analog signals

Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6663205338f57eedb2392263dde48e2717c6e980)

Conflicts:
	libavformat/dtsdec.c
Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Resync FFmpeg with stable/1.2 875649bfaef83172e44404930d755b76e36f9ba1
Clean up signed/unsigned type issues in DVD bookmarks
Prevent DVD bookmarks being set in a menu.

If the 'Action on exit' setting is set to 'Save position and exit', a bookmark will be created automatically.  If the TVPlayback->BACK is bound, exiting the main feature will return to the DVD menu setting a bookmark in the main feature but exiting the menu will overwrite that bookmark with a new one for the menu.  Starting playback from the bookmark would put the user back in the menu rather than the feature (although selecting 'Play' from the DVD menu will usually resume from the correct position).

This can be avoided by preventing bookmarks being set in a menu.  If a more advanced bookmark manager is implemented, this restriction could be removed.
comment out variable with only commented out usage

Was missed in 5f23db5b22 and added a new compiler warning to the
build bots.
Add comparison check to DatabaseConfig class.

This adds a custom '==' operator to the DatabaseConfig class to resolve
possible issues when trying to match an existing connection pool with a
fresh config file.
Have database list objects pass on credentials when copied.

This causes the DBDataRef class to pass on its stored DatabaseConfig
object when duplicating itself, preventing the new class from having to
reread the config.xml to discover the database.

Signed-off-by: Raymond Wagner <rwagner@mythtv.org>