[FFmpeg-cvslog] r22135 - in trunk: libavformat/nutdec.c libavformat/nutenc.c libavutil/tree.c libavutil/tree.h
vitor
subversion
Mon Mar 1 19:16:10 CET 2010
Author: vitor
Date: Mon Mar 1 19:16:10 2010
New Revision: 22135
Log:
Revert r22119 and partially revert 22120.
Replaced:
trunk/libavutil/tree.c
- copied unchanged from r22118, trunk/libavutil/tree.c
trunk/libavutil/tree.h
- copied unchanged from r22118, trunk/libavutil/tree.h
Modified:
trunk/libavformat/nutdec.c
trunk/libavformat/nutenc.c
Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c Mon Mar 1 19:03:53 2010 (r22134)
+++ trunk/libavformat/nutdec.c Mon Mar 1 19:16:10 2010 (r22135)
@@ -901,7 +901,6 @@ static int nut_read_close(AVFormatContex
av_freep(&nut->time_base);
av_freep(&nut->stream);
- av_tree_destroy_free_elem(nut->syncpoints);
for(i = 1; i < nut->header_count; i++)
av_freep(&nut->header[i]);
Modified: trunk/libavformat/nutenc.c
==============================================================================
--- trunk/libavformat/nutenc.c Mon Mar 1 19:03:53 2010 (r22134)
+++ trunk/libavformat/nutenc.c Mon Mar 1 19:16:10 2010 (r22135)
@@ -799,7 +799,6 @@ static int write_trailer(AVFormatContext
put_flush_packet(bc);
av_freep(&nut->stream);
av_freep(&nut->time_base);
- av_tree_destroy_free_elem(nut->syncpoints);
return 0;
}
More information about the ffmpeg-cvslog
mailing list