generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
cddd15ba5c
ffmpeg/libavfilter
History
Alex Sukhanov 86b3435fc0 af_aresample: Fix timestamp of first padded PCM audio packet 
Problem:
ffmpeg generated video file which had two audio packets with the same timestamp: last original audio packet and first padded audio packet.

Timestamp of first added audio packet by 'apad' fitler had the same value as last original audio packet. The problem was in 'aresample' fitler, which used next pts instead of current one.
As long as 'apad' and 'aresample' filters have separate mechanisms of timestamp calculation, they got the same values.

Command line:
ffmpeg -i <input_filename> -shortest -apad 512 -af asetnsamples=n=512 -b:a 1058400 -ac 1 -ar 44100 -async 0 -acodec pcm_s16le -sn -f matroska -y <output_file>

Fix:
Call swr_next_pts() function before swr_convert()

Tested:
FATE tests passed.
Fix has been tested in our Transcoder regression framework on ~10k test videos. It's about ~500k transcodes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15 11:54:02 +01:00
..
libmpcodecs avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration 2013-10-24 07:44:23 +00:00
x86 Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'" 2013-11-01 14:28:08 +01:00
af_aconvert.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
af_adelay.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aecho.c avfilter/af_aecho: free input frame after it is being used 2013-11-07 17:45:47 +00:00
af_afade.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aformat.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_amerge.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_apad.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aphaser.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aresample.c af_aresample: Fix timestamp of first padded PCM audio packet 2013-11-15 11:54:02 +01:00
af_asetnsamples.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_asetrate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_astats.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_astreamsync.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_atempo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_biquads.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_channelmap.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_channelsplit.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_compand.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_earwax.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_join.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_ladspa.c lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings 2013-11-05 00:04:17 +01:00
af_pan.c lavfi/af_pan: support unknown layouts on input. 2013-11-03 10:30:50 +01:00
af_replaygain.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_resample.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_silencedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_volume.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_volume.h
af_volumedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
all_channel_layouts.inc
allfilters.c lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
asrc_abuffer.h
asrc_aevalsrc.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
asrc_anullsrc.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
asrc_flite.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
asrc_sine.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
audio.c Merge remote-tracking branch 'qatar/master' 2013-06-19 08:27:35 +02:00
audio.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avcodec.c lavfi/avcodec: deprecate remainders of the avcodec glue code 2013-03-16 17:04:36 +01:00
avcodec.h Do not leave positive values undefined when negative are defined as error 2013-10-19 16:42:57 +02:00
avf_avectorscope.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
avf_concat.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
avf_showspectrum.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
avf_showwaves.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
avfilter.c Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e' 2013-10-28 13:07:05 +01:00
avfilter.h Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e' 2013-10-28 13:07:05 +01:00
avfiltergraph.c lavfi/avfiltergraph: do not reduce incompatible lists. 2013-11-03 10:30:16 +01:00
avfiltergraph.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02:00
bbox.c
bbox.h
buffer.c Merge remote-tracking branch 'qatar/master' 2013-11-05 12:17:35 +01:00
bufferqueue.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
buffersink.h lavfi/buffersink: fix header. 2013-03-17 12:31:25 +01:00
buffersrc.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
buffersrc.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
deshake_opencl_kernel.h lavfi: modify names of deshake_kernel.h and unsharp_kernel.h 2013-05-10 12:44:04 +02:00
deshake_opencl.c avfilter/opencl: compile kernels separately 2013-11-05 14:29:55 +01:00
deshake_opencl.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
deshake.h avfilter/opencl: compile kernels separately 2013-11-05 14:29:55 +01:00
drawutils.c lavfi/drawutils: set subsampling for rgb too 2013-07-14 17:59:25 +00:00
drawutils.h
dualinput.c avfilter/dualinput: simplify 2013-09-30 08:47:40 +00:00
dualinput.h avfilter/dualinput: simplify 2013-09-30 08:47:40 +00:00
f_ebur128.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_interleave.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_perms.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_select.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_sendcmd.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_settb.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_zmq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
fifo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
filtfmts.c filtfmts-test: Fix use of deprecated API 2013-11-04 16:20:44 +01:00
formats.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
formats.h Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0' 2013-05-18 11:46:09 +02:00
framesync.c lavfi: add an API to synchronize multiple video inputs. 2013-09-23 09:49:37 +02:00
framesync.h lavfi: add an API to synchronize multiple video inputs. 2013-09-23 09:49:37 +02:00
gradfun.h Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d' 2013-10-23 12:14:49 +02:00
graphdump.c avfilter/graphdump: fix use of deprecated symbols 2013-08-25 19:33:44 +02:00
graphparser.c avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 2013-11-07 23:38:44 +01:00
internal.h lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
lavfutils.c avfilter/lavfutils: fix memleak of avpacket 2013-10-12 11:52:10 +02:00
lavfutils.h Do not leave positive values undefined when negative are defined as error 2013-10-19 16:42:57 +02:00
libavfilter.v
lswsutils.c avfilter/lswsutils: dont override the default scaler 2013-10-07 13:28:13 +02:00
lswsutils.h
Makefile lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
opencl_allkernels.c lavfi: modify names of deshake_kernel.h and unsharp_kernel.h 2013-05-10 12:44:04 +02:00
opencl_allkernels.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
pthread.c lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 2013-10-22 17:05:26 +01:00
setpts.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
split.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
thread.h Merge remote-tracking branch 'qatar/master' 2013-09-28 11:02:01 +02:00
transform.c avfilter: various cosmetics 2013-09-12 14:01:43 +00:00
transform.h
trim.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
unsharp_opencl_kernel.h avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
unsharp_opencl.c avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
unsharp_opencl.h lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
unsharp.h avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
version.h lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
vf_alphamerge.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_aspect.c avfilter/vf_aspect: remove dupe constants setup 2013-11-03 16:39:22 +00:00
vf_bbox.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blackdetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blend.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colorbalance.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colorchannelmixer.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colormatrix.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_curves.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_dctdnoiz.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_decimate.c libavfilter/decimate: Add pts of first frame to all frames. 2013-10-31 11:24:43 +01:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_deshake.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_edgedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_elbg.c lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
vf_extractplanes.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fade.c avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
vf_field.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fieldmatch.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fieldorder.c vf_fieldorder: remove superfluous get_video_buffer 2013-11-04 14:37:06 +01:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fps.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_framestep.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_geq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_gradfun.c avfilter/vf_gradfun: add emms_c() for mmxext 2013-11-01 14:42:06 +01:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_histeq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_histogram.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_hqdn3d.h Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a' 2013-04-10 21:14:30 +02:00
vf_hue.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_idet.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_il.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_interlace.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_kerndeint.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_lut3d.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mcdeint.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mergeplanes.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mpdecimate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_noise.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_owdenoise.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_perspective.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_phase.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_psnr.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pullup.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pullup.h avfilter/vf_pullup: remove junk_down nonsense 2013-09-18 12:47:57 +00:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_rotate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_sab.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_scale.c avfilter/vf_scale: add ov/hsub 2013-11-04 15:23:26 +01:00
vf_separatefields.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_smartblur.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_spp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_spp.h lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
vf_stereo3d.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_subtitles.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_telecine.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_tile.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vidstabdetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vidstabtransform.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vignette.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_w3fdif.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
video.c avfilter/video: remove commented out cruft 2013-09-13 19:17:56 +00:00
video.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vidstabutils.c lavfi/vidstab: miscelenaous cosmetics and typo fixes. 2013-04-24 18:30:42 +02:00
vidstabutils.h lavfi: add video stabilization plugins using vid.stab library 2013-04-24 18:30:42 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_cellauto.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_life.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_mandelbrot.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_mptestsrc.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
yadif.h yadif: restore speed of the C filtering code 2013-05-14 09:23:55 +02:00