"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavformat/utils.c" between
libav-12.tar.gz and libav-12.1.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

utils.c  (libav-12):utils.c  (libav-12.1)
skipping to change at line 2366 skipping to change at line 2366
try_decode_frame(ic, st, pkt, try_decode_frame(ic, st, pkt,
(options && i < orig_nb_streams) ? &options[i] : NULL); (options && i < orig_nb_streams) ? &options[i] : NULL);
if (ic->flags & AVFMT_FLAG_NOBUFFER) if (ic->flags & AVFMT_FLAG_NOBUFFER)
av_packet_unref(pkt); av_packet_unref(pkt);
st->codec_info_nb_frames++; st->codec_info_nb_frames++;
count++; count++;
} }
// close codecs which were opened in try_decode_frame()
for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i];
avcodec_close(st->internal->avctx);
}
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
avctx = st->internal->avctx; avctx = st->internal->avctx;
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
/* estimate average framerate if not set by demuxer */ /* estimate average framerate if not set by demuxer */
if (!st->avg_frame_rate.num && if (!st->avg_frame_rate.num &&
st->info->fps_last_dts != st->info->fps_first_dts) { st->info->fps_last_dts != st->info->fps_first_dts) {
int64_t delta_dts = st->info->fps_last_dts - int64_t delta_dts = st->info->fps_last_dts -
st->info->fps_first_dts; st->info->fps_first_dts;
int delta_packets = st->info->fps_last_dts_idx - int delta_packets = st->info->fps_last_dts_idx -
skipping to change at line 2470 skipping to change at line 2465
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
st->internal->avctx_inited = 0; st->internal->avctx_inited = 0;
} }
estimate_timings(ic, old_offset); estimate_timings(ic, old_offset);
find_stream_info_err: find_stream_info_err:
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
avcodec_close(ic->streams[i]->internal->avctx);
av_freep(&ic->streams[i]->info); av_freep(&ic->streams[i]->info);
} }
return ret; return ret;
} }
static AVProgram *find_program_from_stream(AVFormatContext *ic, int s) static AVProgram *find_program_from_stream(AVFormatContext *ic, int s)
{ {
int i, j; int i, j;
for (i = 0; i < ic->nb_programs; i++) for (i = 0; i < ic->nb_programs; i++)
 End of changes. 2 change blocks. 
5 lines changed or deleted 1 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS