"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "avconv.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.

avconv.c  (libav-12)	:	avconv.c  (libav-12.1)
skipping to change at line 1349		skipping to change at line 1349
ret = decode(avctx, decoded_frame, got_output, pkt);		ret = decode(avctx, decoded_frame, got_output, pkt);
if (!*got_output || ret < 0)		if (!*got_output || ret < 0)
return ret;		return ret;
ist->samples_decoded += decoded_frame->nb_samples;		ist->samples_decoded += decoded_frame->nb_samples;
ist->frames_decoded++;		ist->frames_decoded++;
/* if the decoder provides a pts, use it instead of the last packet pts.		/* if the decoder provides a pts, use it instead of the last packet pts.
the decoder could be delaying output by a packet or more. */		the decoder could be delaying output by a packet or more. */
if (decoded_frame->pts != AV_NOPTS_VALUE)		if (decoded_frame->pts != AV_NOPTS_VALUE)
ist->next_dts = decoded_frame->pts;		ist->next_dts = av_rescale_q(decoded_frame->pts, ist->st->time_base, AV_ TIME_BASE_Q);
else if (pkt && pkt->pts != AV_NOPTS_VALUE) {		else if (pkt && pkt->pts != AV_NOPTS_VALUE) {
decoded_frame->pts = pkt->pts;		decoded_frame->pts = pkt->pts;
}		}
if (decoded_frame->pts != AV_NOPTS_VALUE)		if (decoded_frame->pts != AV_NOPTS_VALUE)
decoded_frame->pts = av_rescale_q(decoded_frame->pts,		decoded_frame->pts = av_rescale_q(decoded_frame->pts,
ist->st->time_base,		ist->st->time_base,
(AVRational){1, avctx->sample_rate});		(AVRational){1, avctx->sample_rate});
ist->nb_samples = decoded_frame->nb_samples;		ist->nb_samples = decoded_frame->nb_samples;
for (i = 0; i < ist->nb_filters; i++) {		for (i = 0; i < ist->nb_filters; i++) {
End of changes. 1 change blocks.
1 lines changed or deleted		1 lines changed or added

---