Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-10 01:26:09 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-07-10 01:26:18 +0400
commit57fa9e97424de601a5f10ad7bfc6ce48597c783f (patch)
treeaf23f2590b653c8146be13c513b15df8a85b83e4 /libavformat/nsvdec.c
parent73b1283012cfe89e466fa34da0b2ac1e9fb9893d (diff)
parent27c1f82f561932c83191bcd3e70e0cb1712485ba (diff)
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
-rw-r--r--libavformat/nsvdec.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 4a749a2feb..e1fcfee4cb 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -706,7 +706,6 @@ static int nsv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
static int nsv_read_close(AVFormatContext *s)
{
-/* int i; */
NSVContext *nsv = s->priv_data;
av_freep(&nsv->nsvs_file_offset);
@@ -715,20 +714,6 @@ static int nsv_read_close(AVFormatContext *s)
av_free_packet(&nsv->ahead[0]);
if (nsv->ahead[1].data)
av_free_packet(&nsv->ahead[1]);
-
-#if 0
-
- for(i=0;i<s->nb_streams;i++) {
- AVStream *st = s->streams[i];
- NSVStream *ast = st->priv_data;
- if(ast){
- av_free(ast->index_entries);
- av_free(ast);
- }
- av_free(st->codec->palctrl);
- }
-
-#endif
return 0;
}