← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vlc/utopic

« back to all changes in this revision

Viewing changes to modules/demux/avformat/demux.c

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-07-21 17:52:21 UTC
  • mfrom: (1.1.48) (3.5.44 sid)
  • Revision ID: package-import@ubuntu.com-20120721175221-53m5pclzo992kawy
Tags: 2.0.3-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/demux/avformat/demux.c
2
2
 * demux.c: demuxer using libavformat
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2004-2009 the VideoLAN team
5
 
 * $Id: 3264b115d4dd8fda55c7daeb433c276b59d59471 $
 
5
 * $Id: ada3849c194d510df289397a887940643b511d2b $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
571
571
    int64_t     i_start_time;
572
572
 
573
573
    /* Read a frame */
574
 
    if( av_read_frame( p_sys->ic, &pkt ) )
 
574
    int i_av_ret = av_read_frame( p_sys->ic, &pkt );
 
575
    if( i_av_ret )
575
576
    {
 
577
        /* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
 
578
        if( i_av_ret == AVERROR(EAGAIN) )
 
579
            return 1;
 
580
 
576
581
        return 0;
577
582
    }
578
583
    if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )