← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavformat/nsvdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/nsvdec.c
663
663
    av_dlog(s, "%s()\n", __FUNCTION__);
664
664
 
665
665
    /* in case we don't already have something to eat ... */
666
 
    if (nsv->ahead[0].data == NULL && nsv->ahead[1].data == NULL)
 
666
    if (!nsv->ahead[0].data && !nsv->ahead[1].data)
667
667
        err = nsv_read_chunk(s, 0);
668
668
    if (err < 0)
669
669
        return err;
704
704
 
705
705
static int nsv_read_close(AVFormatContext *s)
706
706
{
707
 
/*     int i; */
708
707
    NSVContext *nsv = s->priv_data;
709
708
 
710
709
    av_freep(&nsv->nsvs_file_offset);
713
712
        av_free_packet(&nsv->ahead[0]);
714
713
    if (nsv->ahead[1].data)
715
714
        av_free_packet(&nsv->ahead[1]);
716
 
 
717
 
#if 0
718
 
 
719
 
    for(i=0;i<s->nb_streams;i++) {
720
 
        AVStream *st = s->streams[i];
721
 
        NSVStream *ast = st->priv_data;
722
 
        if(ast){
723
 
            av_free(ast->index_entries);
724
 
            av_free(ast);
725
 
        }
726
 
        av_free(st->codec->palctrl);
727
 
    }
728
 
 
729
 
#endif
730
715
    return 0;
731
716
}
732
717