Merge remote-tracking branch 'thomas-joiner/bug_10222'

#37 Refs #10222 Closes #11411 Signed-off-by: Stuart Auchterlonie <stuarta@squashedfrog.net>
MythTV · Feb 26, 2013 · aaa5255 · aaa5255
2 parents 838c58d + 0026dda
commit aaa5255
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1380,8 +1380,6 @@ void AvFormatDecoder::InitVideoCodec(AVStream *stream, AVCodecContext *enc,
         FlagIsSet(kDecodeFewBlocks) || FlagIsSet(kDecodeNoLoopFilter)   ||
         FlagIsSet(kDecodeNoDecode))
     {
-        enc->flags2 |= CODEC_FLAG2_FAST;
-
         if ((AV_CODEC_ID_MPEG2VIDEO == codec->id) ||
             (AV_CODEC_ID_MPEG1VIDEO == codec->id))
         {