Skip to content

Commit

Permalink
Merge branch 'warningfixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartm committed Dec 6, 2010
2 parents 26761ab + 64d055c commit d6e784b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/avformatdecoder.cpp
Expand Up @@ -2866,7 +2866,6 @@ bool AvFormatDecoder::ProcessVideoPacket(AVStream *curstream, AVPacket *pkt)

bool AvFormatDecoder::ProcessVideoFrame(AVStream *stream, AVFrame *mpa_pic)
{
long long pts = 0;
AVCodecContext *context = stream->codec;

// Decode CEA-608 and CEA-708 captions
Expand Down Expand Up @@ -3983,7 +3982,7 @@ bool AvFormatDecoder::GetFrame(DecodeType decodetype)
av_init_packet(pkt);
}

int retval;
int retval = 0;
if (!ic || ((retval = av_read_frame(ic, pkt)) < 0))
{
if (retval == -EAGAIN)
Expand Down

0 comments on commit d6e784b

Please sign in to comment.