Permalink
Browse files

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

MythTV#37

Refs #10222
Closes #11411

Signed-off-by: Stuart Auchterlonie <stuarta@squashedfrog.net>
  • Loading branch information...
2 parents 838c58d + 0026dda commit aaa5255f5bdf90233846e4c5c17e5d61fd7d500a @stuarta stuarta committed Feb 26, 2013
Showing with 0 additions and 2 deletions.
  1. +0 −2 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))
{

0 comments on commit aaa5255

Please sign in to comment.