Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: patched-ffmpeg-mt/libavformat/nsvdec.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * NSV demuxer 2 * NSV demuxer
3 * Copyright (c) 2004 The FFmpeg Project 3 * Copyright (c) 2004 The FFmpeg Project
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 return 0; 721 return 0;
722 } 722 }
723 723
724 static int nsv_read_close(AVFormatContext *s) 724 static int nsv_read_close(AVFormatContext *s)
725 { 725 {
726 /* int i; */ 726 /* int i; */
727 NSVContext *nsv = s->priv_data; 727 NSVContext *nsv = s->priv_data;
728 728
729 av_freep(&nsv->nsvs_file_offset); 729 av_freep(&nsv->nsvs_file_offset);
730 av_freep(&nsv->nsvs_timestamps); 730 av_freep(&nsv->nsvs_timestamps);
731 if (nsv->ahead[0].data)
732 av_free_packet(&nsv->ahead[0]);
733 if (nsv->ahead[1].data)
734 av_free_packet(&nsv->ahead[1]);
731 735
732 #if 0 736 #if 0
733 737
734 for(i=0;i<s->nb_streams;i++) { 738 for(i=0;i<s->nb_streams;i++) {
735 AVStream *st = s->streams[i]; 739 AVStream *st = s->streams[i];
736 NSVStream *ast = st->priv_data; 740 NSVStream *ast = st->priv_data;
737 if(ast){ 741 if(ast){
738 av_free(ast->index_entries); 742 av_free(ast->index_entries);
739 av_free(ast); 743 av_free(ast);
740 } 744 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 AVInputFormat nsv_demuxer = { 777 AVInputFormat nsv_demuxer = {
774 "nsv", 778 "nsv",
775 NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"), 779 NULL_IF_CONFIG_SMALL("Nullsoft Streaming Video"),
776 sizeof(NSVContext), 780 sizeof(NSVContext),
777 nsv_probe, 781 nsv_probe,
778 nsv_read_header, 782 nsv_read_header,
779 nsv_read_packet, 783 nsv_read_packet,
780 nsv_read_close, 784 nsv_read_close,
781 nsv_read_seek, 785 nsv_read_seek,
782 }; 786 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698