diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:00:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:17:51 +0100 |
| commit | b9d887c225466576ae80ef7f2b109e866ff137b2 (patch) | |
| tree | 61ffb780b58021fe4186fb2caad3a8fdcb09bc5f /libavfilter | |
| parent | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (diff) | |
| parent | 072be3e8969f24113d599444be4d6a0ed04a6602 (diff) | |
| download | ffmpeg-streaming-b9d887c225466576ae80ef7f2b109e866ff137b2.zip ffmpeg-streaming-b9d887c225466576ae80ef7f2b109e866ff137b2.tar.gz | |
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_asyncts.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 188609b..d3123f5 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -152,19 +152,19 @@ static int request_frame(AVFilterLink *link) handle_trimming(ctx); if (nb_samples = get_delay(s)) { - AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE, - nb_samples); - if (!buf) - return AVERROR(ENOMEM); - ret = avresample_convert(s->avr, buf->extended_data, - buf->linesize[0], nb_samples, NULL, 0, 0); - if (ret <= 0) { - avfilter_unref_bufferp(&buf); - return (ret < 0) ? ret : AVERROR_EOF; - } + AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE, + nb_samples); + if (!buf) + return AVERROR(ENOMEM); + ret = avresample_convert(s->avr, buf->extended_data, + buf->linesize[0], nb_samples, NULL, 0, 0); + if (ret <= 0) { + avfilter_unref_bufferp(&buf); + return (ret < 0) ? ret : AVERROR_EOF; + } - buf->pts = s->pts; - return ff_filter_frame(link, buf); + buf->pts = s->pts; + return ff_filter_frame(link, buf); } } |
