comparison src/ffmpeg/libavformat/utils.c @ 830:68562d99230f trunk

[svn] - more symbol cleanups.
author nenolod
date Mon, 12 Mar 2007 15:23:10 -0700
parents 3cbdc6e19d7c
children dec0488e1344
comparison
equal deleted inserted replaced
829:1c250e20c6e3 830:68562d99230f
1132 int index; 1132 int index;
1133 1133
1134 if((unsigned)st->nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry)) 1134 if((unsigned)st->nb_index_entries + 1 >= UINT_MAX / sizeof(AVIndexEntry))
1135 return -1; 1135 return -1;
1136 1136
1137 entries = av_fast_realloc(st->index_entries, 1137 entries = av_realloc(st->index_entries,
1138 &st->index_entries_allocated_size,
1139 (st->nb_index_entries + 1) * 1138 (st->nb_index_entries + 1) *
1140 sizeof(AVIndexEntry)); 1139 sizeof(AVIndexEntry));
1141 if(!entries) 1140 if(!entries)
1142 return -1; 1141 return -1;
1143 1142
2389 return ret; 2388 return ret;
2390 2389
2391 truncate_ts(s->streams[pkt->stream_index], pkt); 2390 truncate_ts(s->streams[pkt->stream_index], pkt);
2392 2391
2393 ret= s->oformat->write_packet(s, pkt); 2392 ret= s->oformat->write_packet(s, pkt);
2393 #if 0
2394 if(!ret) 2394 if(!ret)
2395 ret= url_ferror(&s->pb); 2395 ret= url_ferror(&s->pb);
2396 #endif
2396 return ret; 2397 return ret;
2397 } 2398 }
2398 2399
2399 /** 2400 /**
2400 * Interleave a packet per DTS in an output media file. 2401 * Interleave a packet per DTS in an output media file.
2519 av_free_packet(&opkt); 2520 av_free_packet(&opkt);
2520 pkt= NULL; 2521 pkt= NULL;
2521 2522
2522 if(ret<0) 2523 if(ret<0)
2523 return ret; 2524 return ret;
2525 #if 0
2524 if(url_ferror(&s->pb)) 2526 if(url_ferror(&s->pb))
2525 return url_ferror(&s->pb); 2527 return url_ferror(&s->pb);
2528 #endif
2526 } 2529 }
2527 } 2530 }
2528 2531
2529 /** 2532 /**
2530 * @brief Write the stream trailer to an output media file and 2533 * @brief Write the stream trailer to an output media file and
2550 2553
2551 av_free_packet(&pkt); 2554 av_free_packet(&pkt);
2552 2555
2553 if(ret<0) 2556 if(ret<0)
2554 goto fail; 2557 goto fail;
2558 #if 0
2555 if(url_ferror(&s->pb)) 2559 if(url_ferror(&s->pb))
2556 goto fail; 2560 goto fail;
2561 #endif
2557 } 2562 }
2558 2563
2559 if(s->oformat->write_trailer) 2564 if(s->oformat->write_trailer)
2560 ret = s->oformat->write_trailer(s); 2565 ret = s->oformat->write_trailer(s);
2561 fail: 2566 fail:
2567 #if 0
2562 if(ret == 0) 2568 if(ret == 0)
2563 ret=url_ferror(&s->pb); 2569 ret=url_ferror(&s->pb);
2570 #endif
2564 for(i=0;i<s->nb_streams;i++) 2571 for(i=0;i<s->nb_streams;i++)
2565 av_freep(&s->streams[i]->priv_data); 2572 av_freep(&s->streams[i]->priv_data);
2566 av_freep(&s->priv_data); 2573 av_freep(&s->priv_data);
2567 return ret; 2574 return ret;
2568 } 2575 }