June 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r13899 - in trunk/libavformat: isom.c mov.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: bcoudurier Date: Mon Jun 23 01:52:57 2008 New Revision: 13899 Log: chinese avs demuxing support, demux AVSFileFormat.mp4 Modified: trunk/libavformat/isom.c trunk/libavformat/mov.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c (original) +++ trunk/libavformat/isom.c Mon Jun 23 01:52:57 2008 @@ -123,6 +123,7 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ + { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Mon Jun 23 01:52:57 2008 @@ -1634,6 +1634,7 @@ static int mov_read_elst(MOVContext *c, } static const MOVParseTableEntry mov_default_parse_table[] = { +{ MKTAG('a','v','s','s'), mov_read_extradata }, { MKTAG('c','o','6','4'), mov_read_stco }, { MKTAG('c','t','t','s'), mov_read_ctts }, /* composition time to sample */ { MKTAG('d','i','n','f'), mov_read_default },

5 19

r14024 - trunk/libavcodec/libfaad.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: bcoudurier Date: Sat Jun 28 21:41:18 2008 New Revision: 14024 Log: set frame_size in libfaad decoder Modified: trunk/libavcodec/libfaad.c Modified: trunk/libavcodec/libfaad.c ============================================================================== --- trunk/libavcodec/libfaad.c (original) +++ trunk/libavcodec/libfaad.c Sat Jun 28 21:41:18 2008 @@ -196,7 +196,8 @@ static int faac_decode_frame(AVCodecCont s->faacDecGetErrorMessage(frame_info.error)); return -1; } - + if (!avctx->frame_size) + avctx->frame_size = frame_info.samples/avctx->channels; frame_info.samples *= s->sample_size; memcpy(data, out, frame_info.samples); // CHECKME - can we cheat this one

1 0

r14023 - trunk/libavcodec/i386/flacdsp_mmx.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: astrange Date: Sat Jun 28 20:30:50 2008 New Revision: 14023 Log: Realign newlines. Modified: trunk/libavcodec/i386/flacdsp_mmx.c Modified: trunk/libavcodec/i386/flacdsp_mmx.c ============================================================================== --- trunk/libavcodec/i386/flacdsp_mmx.c (original) +++ trunk/libavcodec/i386/flacdsp_mmx.c Sat Jun 28 20:30:50 2008 @@ -29,32 +29,32 @@ static void apply_welch_window_sse2(cons x86_reg i = -n2*sizeof(int32_t); x86_reg j = n2*sizeof(int32_t); asm volatile( - "movsd %0, %%xmm7 \n\t" - "movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t" - "movapd "MANGLE(ff_pd_2)", %%xmm5 \n\t" - "movlhps %%xmm7, %%xmm7 \n\t" - "subpd %%xmm5, %%xmm7 \n\t" - "addsd %%xmm6, %%xmm7 \n\t" + "movsd %0, %%xmm7 \n\t" + "movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t" + "movapd "MANGLE(ff_pd_2)", %%xmm5 \n\t" + "movlhps %%xmm7, %%xmm7 \n\t" + "subpd %%xmm5, %%xmm7 \n\t" + "addsd %%xmm6, %%xmm7 \n\t" ::"m"(c) ); #define WELCH(MOVPD, offset)\ asm volatile(\ - "1: \n\t"\ - "movapd %%xmm7, %%xmm1 \n\t"\ - "mulpd %%xmm1, %%xmm1 \n\t"\ - "movapd %%xmm6, %%xmm0 \n\t"\ - "subpd %%xmm1, %%xmm0 \n\t"\ - "pshufd $0x4e, %%xmm0, %%xmm1 \n\t"\ - "cvtpi2pd (%3,%0), %%xmm2 \n\t"\ - "cvtpi2pd "#offset"*4(%3,%1), %%xmm3 \n\t"\ - "mulpd %%xmm0, %%xmm2 \n\t"\ - "mulpd %%xmm1, %%xmm3 \n\t"\ - "movapd %%xmm2, (%2,%0,2) \n\t"\ + "1: \n\t"\ + "movapd %%xmm7, %%xmm1 \n\t"\ + "mulpd %%xmm1, %%xmm1 \n\t"\ + "movapd %%xmm6, %%xmm0 \n\t"\ + "subpd %%xmm1, %%xmm0 \n\t"\ + "pshufd $0x4e, %%xmm0, %%xmm1 \n\t"\ + "cvtpi2pd (%3,%0), %%xmm2 \n\t"\ + "cvtpi2pd "#offset"*4(%3,%1), %%xmm3 \n\t"\ + "mulpd %%xmm0, %%xmm2 \n\t"\ + "mulpd %%xmm1, %%xmm3 \n\t"\ + "movapd %%xmm2, (%2,%0,2) \n\t"\ MOVPD" %%xmm3, "#offset"*8(%2,%1,2) \n\t"\ - "subpd %%xmm5, %%xmm7 \n\t"\ - "sub $8, %1 \n\t"\ - "add $8, %0 \n\t"\ - "jl 1b \n\t"\ + "subpd %%xmm5, %%xmm7 \n\t"\ + "sub $8, %1 \n\t"\ + "add $8, %0 \n\t"\ + "jl 1b \n\t"\ :"+&r"(i), "+&r"(j)\ :"r"(w_data+n2), "r"(data+n2)\ ); @@ -85,52 +85,52 @@ void ff_flac_compute_autocorr_sse2(const x86_reg i = -len*sizeof(double); if(j == lag-2) { asm volatile( - "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" - "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" - "movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t" - "1: \n\t" - "movapd (%4,%0), %%xmm3 \n\t" - "movupd -8(%5,%0), %%xmm4 \n\t" - "movapd (%5,%0), %%xmm5 \n\t" - "mulpd %%xmm3, %%xmm4 \n\t" - "mulpd %%xmm3, %%xmm5 \n\t" - "mulpd -16(%5,%0), %%xmm3 \n\t" - "addpd %%xmm4, %%xmm1 \n\t" - "addpd %%xmm5, %%xmm0 \n\t" - "addpd %%xmm3, %%xmm2 \n\t" - "add $16, %0 \n\t" - "jl 1b \n\t" - "movhlps %%xmm0, %%xmm3 \n\t" - "movhlps %%xmm1, %%xmm4 \n\t" - "movhlps %%xmm2, %%xmm5 \n\t" - "addsd %%xmm3, %%xmm0 \n\t" - "addsd %%xmm4, %%xmm1 \n\t" - "addsd %%xmm5, %%xmm2 \n\t" - "movsd %%xmm0, %1 \n\t" - "movsd %%xmm1, %2 \n\t" - "movsd %%xmm2, %3 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t" + "1: \n\t" + "movapd (%4,%0), %%xmm3 \n\t" + "movupd -8(%5,%0), %%xmm4 \n\t" + "movapd (%5,%0), %%xmm5 \n\t" + "mulpd %%xmm3, %%xmm4 \n\t" + "mulpd %%xmm3, %%xmm5 \n\t" + "mulpd -16(%5,%0), %%xmm3 \n\t" + "addpd %%xmm4, %%xmm1 \n\t" + "addpd %%xmm5, %%xmm0 \n\t" + "addpd %%xmm3, %%xmm2 \n\t" + "add $16, %0 \n\t" + "jl 1b \n\t" + "movhlps %%xmm0, %%xmm3 \n\t" + "movhlps %%xmm1, %%xmm4 \n\t" + "movhlps %%xmm2, %%xmm5 \n\t" + "addsd %%xmm3, %%xmm0 \n\t" + "addsd %%xmm4, %%xmm1 \n\t" + "addsd %%xmm5, %%xmm2 \n\t" + "movsd %%xmm0, %1 \n\t" + "movsd %%xmm1, %2 \n\t" + "movsd %%xmm2, %3 \n\t" :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]), "=m"(autoc[j+2]) :"r"(data1+len), "r"(data1+len-j) ); } else { asm volatile( - "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" - "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" - "1: \n\t" - "movapd (%3,%0), %%xmm3 \n\t" - "movupd -8(%4,%0), %%xmm4 \n\t" - "mulpd %%xmm3, %%xmm4 \n\t" - "mulpd (%4,%0), %%xmm3 \n\t" - "addpd %%xmm4, %%xmm1 \n\t" - "addpd %%xmm3, %%xmm0 \n\t" - "add $16, %0 \n\t" - "jl 1b \n\t" - "movhlps %%xmm0, %%xmm3 \n\t" - "movhlps %%xmm1, %%xmm4 \n\t" - "addsd %%xmm3, %%xmm0 \n\t" - "addsd %%xmm4, %%xmm1 \n\t" - "movsd %%xmm0, %1 \n\t" - "movsd %%xmm1, %2 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" + "1: \n\t" + "movapd (%3,%0), %%xmm3 \n\t" + "movupd -8(%4,%0), %%xmm4 \n\t" + "mulpd %%xmm3, %%xmm4 \n\t" + "mulpd (%4,%0), %%xmm3 \n\t" + "addpd %%xmm4, %%xmm1 \n\t" + "addpd %%xmm3, %%xmm0 \n\t" + "add $16, %0 \n\t" + "jl 1b \n\t" + "movhlps %%xmm0, %%xmm3 \n\t" + "movhlps %%xmm1, %%xmm4 \n\t" + "addsd %%xmm3, %%xmm0 \n\t" + "addsd %%xmm4, %%xmm1 \n\t" + "movsd %%xmm0, %1 \n\t" + "movsd %%xmm1, %2 \n\t" :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]) :"r"(data1+len), "r"(data1+len-j) );

1 0

r14022 - trunk/libavcodec/i386/flacdsp_mmx.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: astrange Date: Sat Jun 28 20:27:31 2008 New Revision: 14022 Log: Use MANGLE() instead of memory operands to read globals. (fixes out of registers with apple gcc 4.2) Modified: trunk/libavcodec/i386/flacdsp_mmx.c Modified: trunk/libavcodec/i386/flacdsp_mmx.c ============================================================================== --- trunk/libavcodec/i386/flacdsp_mmx.c (original) +++ trunk/libavcodec/i386/flacdsp_mmx.c Sat Jun 28 20:27:31 2008 @@ -30,12 +30,12 @@ static void apply_welch_window_sse2(cons x86_reg j = n2*sizeof(int32_t); asm volatile( "movsd %0, %%xmm7 \n\t" - "movapd %1, %%xmm6 \n\t" - "movapd %2, %%xmm5 \n\t" + "movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t" + "movapd "MANGLE(ff_pd_2)", %%xmm5 \n\t" "movlhps %%xmm7, %%xmm7 \n\t" "subpd %%xmm5, %%xmm7 \n\t" "addsd %%xmm6, %%xmm7 \n\t" - ::"m"(c), "m"(*ff_pd_1), "m"(*ff_pd_2) + ::"m"(c) ); #define WELCH(MOVPD, offset)\ asm volatile(\ @@ -85,9 +85,9 @@ void ff_flac_compute_autocorr_sse2(const x86_reg i = -len*sizeof(double); if(j == lag-2) { asm volatile( - "movsd %6, %%xmm0 \n\t" - "movsd %6, %%xmm1 \n\t" - "movsd %6, %%xmm2 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t" "1: \n\t" "movapd (%4,%0), %%xmm3 \n\t" "movupd -8(%5,%0), %%xmm4 \n\t" @@ -110,12 +110,12 @@ void ff_flac_compute_autocorr_sse2(const "movsd %%xmm1, %2 \n\t" "movsd %%xmm2, %3 \n\t" :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]), "=m"(autoc[j+2]) - :"r"(data1+len), "r"(data1+len-j), "m"(*ff_pd_1) + :"r"(data1+len), "r"(data1+len-j) ); } else { asm volatile( - "movsd %5, %%xmm0 \n\t" - "movsd %5, %%xmm1 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t" + "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t" "1: \n\t" "movapd (%3,%0), %%xmm3 \n\t" "movupd -8(%4,%0), %%xmm4 \n\t" @@ -132,7 +132,7 @@ void ff_flac_compute_autocorr_sse2(const "movsd %%xmm0, %1 \n\t" "movsd %%xmm1, %2 \n\t" :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]) - :"r"(data1+len), "r"(data1+len-j), "m"(*ff_pd_1) + :"r"(data1+len), "r"(data1+len-j) ); } }

1 0

r14021 - trunk/libavcodec/dct-test.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: michael Date: Sat Jun 28 12:42:31 2008 New Revision: 14021 Log: Make code independant/less dependant on dsputil. This also makes the mmx parts work again ... Modified: trunk/libavcodec/dct-test.c Modified: trunk/libavcodec/dct-test.c ============================================================================== --- trunk/libavcodec/dct-test.c (original) +++ trunk/libavcodec/dct-test.c Sat Jun 28 12:42:31 2008 @@ -33,7 +33,6 @@ #include <math.h> #include "libavutil/common.h" -#include "dsputil.h" #include "simple_idct.h" #include "faandct.h" @@ -79,6 +78,8 @@ struct algo { #define FAAN_SCALE NO_PERM #endif +static int cpu_flags; + struct algo algos[] = { {"REF-DBL", 0, fdct, fdct, NO_PERM}, {"FAAN", 0, ff_faandct, fdct, FAAN_SCALE}, @@ -172,6 +173,14 @@ static DCTELEM block[64] __attribute__ ( static DCTELEM block1[64] __attribute__ ((aligned (8))); static DCTELEM block_org[64] __attribute__ ((aligned (8))); +static inline void mmx_emms(void) +{ +#ifdef HAVE_MMX + if (cpu_flags & MM_MMX) + asm volatile ("emms\n\t"); +#endif +} + void dct_error(const char *name, int is_idct, void (*fdct_func)(DCTELEM *block), void (*fdct_ref)(DCTELEM *block), int form, int test) @@ -249,7 +258,7 @@ void dct_error(const char *name, int is_ #endif fdct_func(block); - emms_c(); /* for ff_mmx_idct */ + mmx_emms(); if (form == SCALE_PERM) { for(i=0; i<64; i++) { @@ -346,7 +355,7 @@ void dct_error(const char *name, int is_ it1 += NB_ITS_SPEED; ti1 = gettime() - ti; } while (ti1 < 1000000); - emms_c(); + mmx_emms(); printf("%s %s: %0.1f kdct/s\n", is_idct ? "IDCT" : "DCT", @@ -506,7 +515,7 @@ void idct248_error(const char *name, it1 += NB_ITS_SPEED; ti1 = gettime() - ti; } while (ti1 < 1000000); - emms_c(); + mmx_emms(); printf("%s %s: %0.1f kdct/s\n", 1 ? "IDCT248" : "DCT248", @@ -528,7 +537,7 @@ int main(int argc, char **argv) int test_idct = 0, test_248_dct = 0; int c,i; int test=1; - int cpu_flags = mm_support(); + cpu_flags = mm_support(); init_fdct(); idct_mmx_init();

1 0

r14020 - trunk/libavformat/mtv.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: reimar Date: Sat Jun 28 11:01:16 2008 New Revision: 14020 Log: Change mtv_read_packet so it does not break after seeking (displaying a shifted image). Modified: trunk/libavformat/mtv.c Modified: trunk/libavformat/mtv.c ============================================================================== --- trunk/libavformat/mtv.c (original) +++ trunk/libavformat/mtv.c Sat Jun 28 11:01:16 2008 @@ -46,9 +46,7 @@ typedef struct MTVDemuxContext { unsigned int img_height; // unsigned int img_segment_size; ///< size of image segment unsigned int video_fps; // - unsigned int audio_subsegments; ///< audio subsegments on one segment - - uint8_t audio_packet_count; + unsigned int full_segment_size; } MTVDemuxContext; @@ -67,6 +65,7 @@ static int mtv_read_header(AVFormatConte MTVDemuxContext *mtv = s->priv_data; ByteIOContext *pb = s->pb; AVStream *st; + unsigned int audio_subsegments; url_fskip(pb, 3); @@ -81,15 +80,14 @@ static int mtv_read_header(AVFormatConte mtv->img_height = get_le16(pb); mtv->img_segment_size = get_le16(pb); url_fskip(pb, 4); - mtv->audio_subsegments = get_le16(pb); - mtv->video_fps = (mtv->audio_br / 4) / mtv->audio_subsegments; + audio_subsegments = get_le16(pb); + mtv->full_segment_size = + audio_subsegments * (MTV_AUDIO_PADDING_SIZE + MTV_ASUBCHUNK_DATA_SIZE) + + mtv->img_segment_size; + mtv->video_fps = (mtv->audio_br / 4) / audio_subsegments; /* FIXME Add sanity check here */ - /* first packet is always audio*/ - - mtv->audio_packet_count = 1; - /* all systems go! init decoders */ /* video - raw rgb565 */ @@ -139,7 +137,7 @@ static int mtv_read_packet(AVFormatConte ret = 0; - if(mtv->audio_subsegments >= mtv->audio_packet_count) + if((url_ftell(pb) - s->data_offset + mtv->img_segment_size) % mtv->full_segment_size) { url_fskip(pb, MTV_AUDIO_PADDING_SIZE); @@ -147,7 +145,6 @@ static int mtv_read_packet(AVFormatConte if(ret != MTV_ASUBCHUNK_DATA_SIZE) return AVERROR(EIO); - mtv->audio_packet_count++; pkt->pos -= MTV_AUDIO_PADDING_SIZE; pkt->stream_index = AUDIO_SID; @@ -168,7 +165,6 @@ static int mtv_read_packet(AVFormatConte for(i=0;i<mtv->img_segment_size/2;i++) *((uint16_t *)pkt->data+i) = bswap_16(*((uint16_t *)pkt->data+i)); #endif - mtv->audio_packet_count = 1; pkt->stream_index = VIDEO_SID; }

1 0

r14019 - trunk/libavformat/mtv.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: reimar Date: Sat Jun 28 10:59:02 2008 New Revision: 14019 Log: Fix pkt->pos to really point at start of packet for mtv audio packets. Modified: trunk/libavformat/mtv.c Modified: trunk/libavformat/mtv.c ============================================================================== --- trunk/libavformat/mtv.c (original) +++ trunk/libavformat/mtv.c Sat Jun 28 10:59:02 2008 @@ -148,6 +148,7 @@ static int mtv_read_packet(AVFormatConte return AVERROR(EIO); mtv->audio_packet_count++; + pkt->pos -= MTV_AUDIO_PADDING_SIZE; pkt->stream_index = AUDIO_SID; }else

1 0

r14018 - trunk/libavformat/aiff.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: bcoudurier Date: Sat Jun 28 06:54:39 2008 New Revision: 14018 Log: cosmetics Modified: trunk/libavformat/aiff.c Modified: trunk/libavformat/aiff.c ============================================================================== --- trunk/libavformat/aiff.c (original) +++ trunk/libavformat/aiff.c Sat Jun 28 06:54:39 2008 @@ -44,7 +44,7 @@ static const AVCodecTag codec_aiff_tags[ #define AIFF 0 #define AIFF_C_VERSION1 0xA2805140 -static int aiff_codec_get_id (int bps) +static int aiff_codec_get_id(int bps) { if (bps <= 8) return CODEC_ID_PCM_S8;

1 0

r14017 - trunk/libavformat/aiff.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: bcoudurier Date: Sat Jun 28 06:53:01 2008 New Revision: 14017 Log: cosmetics, align vertically Modified: trunk/libavformat/aiff.c Modified: trunk/libavformat/aiff.c ============================================================================== --- trunk/libavformat/aiff.c (original) +++ trunk/libavformat/aiff.c Sat Jun 28 06:53:01 2008 @@ -25,19 +25,19 @@ #include "riff.h" static const AVCodecTag codec_aiff_tags[] = { - { CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S8, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S24BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_S32BE, MKTAG('N','O','N','E') }, - { CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, - { CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, - { CODEC_ID_MACE3, MKTAG('M','A','C','3') }, - { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, - { CODEC_ID_GSM, MKTAG('G','S','M',' ') }, - { CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') }, - { CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, + { CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') }, + { CODEC_ID_PCM_S8, MKTAG('N','O','N','E') }, + { CODEC_ID_PCM_S24BE, MKTAG('N','O','N','E') }, + { CODEC_ID_PCM_S32BE, MKTAG('N','O','N','E') }, + { CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, + { CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, + { CODEC_ID_MACE3, MKTAG('M','A','C','3') }, + { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, + { CODEC_ID_GSM, MKTAG('G','S','M',' ') }, + { CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') }, + { CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, - { CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, + { CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, { 0, 0 }, };

1 0

r14016 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 27 Jun '08

27 Jun '08

Author: bcoudurier Date: Fri Jun 27 23:43:15 2008 New Revision: 14016 Log: unset Track sets, relying in AVStream->priv_data and will be freed in av_close_input_file Modified: trunk/libavformat/mxf.c Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Fri Jun 27 23:43:15 2008 @@ -1015,6 +1015,9 @@ static int mxf_read_close(AVFormatContex case MaterialPackage: av_freep(&((MXFPackage *)mxf->metadata_sets[i])->tracks_refs); break; + case Track: + mxf->metadata_sets[i] = NULL; /* will be freed later */ + break; default: break; }

1 0