Sorry, unexpected merge...

Merge branch 'master' of code.mythtv.org:mythtv
MythTV · Jul 31, 2013 · 1ee7744 · 1ee7744
2 parents 4455a89 + d655bc4
commit 1ee7744
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
@@ -1066,7 +1066,7 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
         {
             // delete any records for this recordings
             query.prepare("DELETE FROM recordedmarkup "
-                          "WHERE chanid = CHANID AND starttime = STARTTIME;");
+                          "WHERE chanid = :CHANID AND starttime = :STARTTIME;");
                 query.bindValue(":CHANID", chanID);
                 query.bindValue(":STARTTIME", startTime);
             query.exec();
@@ -1119,7 +1119,7 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
         {
             // delete any records for this recordings
             query.prepare("DELETE FROM recordedseek "
-                          "WHERE chanid = CHANID AND starttime = STARTTIME;");
+                          "WHERE chanid = :CHANID AND starttime = :STARTTIME;");
                 query.bindValue(":CHANID", chanID);
                 query.bindValue(":STARTTIME", startTime);
             query.exec();

diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -587,8 +587,6 @@ bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames)
             break;
         }
     }
-    if (!st)
-        return false;
 
     int seekDelta = desiredFrame - framesPlayed;
 
@@ -622,7 +620,7 @@ bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames)
 
     int normalframes = 0;
 
-    if (st->cur_dts != (int64_t)AV_NOPTS_VALUE)
+    if (st && st->cur_dts != (int64_t)AV_NOPTS_VALUE)
     {
 
         int64_t adj_cur_dts = st->cur_dts;

diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
@@ -34,7 +34,7 @@ EITFixUp::EITFixUp()
       m_dishPPVCode("\\s*\\(([A-Z]|[0-9]){5}\\)\\s*$"),
       m_ukThen("\\s*(Then|Followed by) 60 Seconds\\.", Qt::CaseInsensitive),
       m_ukNew("(New\\.|\\s*(Brand New|New)\\s*(Series|Episode)\\s*[:\\.\\-])",Qt::CaseInsensitive),
-      m_ukNewTitle("^Brand New\\s*",Qt::CaseInsensitive),
+      m_ukNewTitle("^(Brand New|New:)\\s*",Qt::CaseInsensitive),
       m_ukCEPQ("[:\\!\\.\\?]"),
       m_ukColonPeriod("[:\\.]"),
       m_ukDotSpaceStart("^\\. "),