summaryrefslogtreecommitdiff
path: root/libavfilter/af_asyncts.c
Commit message (Collapse)AuthorAge
* Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'Michael Niedermayer2013-05-10
|\ | | | | | | | | | | | | * commit '16a4a18db089af8c432f1cdec62155000585b72c': af_asyncts: fix offset calculation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_asyncts: fix offset calculationAnton Khirnov2013-05-10
| | | | | | | | | | | | | | delta is in samples, not bytes. Also the sample format is not guaranteed to be planar. CC:libav-stable@libav.org
* | Merge commit '093804a93cc5da3f95f98265a5df116912443cec'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '093804a93cc5da3f95f98265a5df116912443cec': avfilter: Add av_cold attributes to init/uninit functions Conflicts: libavfilter/af_ashowinfo.c libavfilter/af_volume.c libavfilter/src_movie.c libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: Add av_cold attributes to init/uninit functionsDiego Biurrun2013-05-04
| |
| * lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-09
| |
* | lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | * commit 'b2b25b0659fa047da6266d2ce165d43011136b30': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_asyncts: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
* | Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'Michael Niedermayer2013-03-23
|\| | | | | | | | | | | | | * commit '20a8ee3061e6d777600c13db731bee3c25878991': af_asyncts: fix compensation and PTS monotonicity Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_asyncts: fix compensation and PTS monotonicityJindřich Makovička2013-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch improves af_asyncts behavior on streams with bogus PTS, which are either non-monotonic, or contain PTS jitter, and trigger the non-monotonicity error. With this patch, af_asyncts is able to correct these streams and avoid the error. Firstly, it fixes resample compensation calculation by supplying proper units to avresample_set_compensation (sample count per second instead of sample count per some arbitrary frame size). Also, the calculation of the compensation itself is fixed - delta is proportional to an adjustment of the compensation, not the compensation itself. Ideally, the compensation should converge to a value that keeps delta at zero. To be able to deal with sources with PTS jitter even without resampling, small PTS errors are adjusted, so the output frames do not overlap. Finally, one more monotonicity check is added. The FATE reference changes because now there is 8 less samples of silence because of the pts jitter. Signed-off-by: Jindřich Makovička <makovick@gmail.com>
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-08
| | | | | | | | | | Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
* | Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd': ivi_common: use proper logging context in ivi_decode_blocks(). ivi_common: make some functions and tables static. asyncts: ignore min_delta only if first_pts is set Conflicts: libavcodec/ivi_common.c libavcodec/ivi_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asyncts: ignore min_delta only if first_pts is setJustin Ruggles2012-12-13
| |
* | Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | * commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f': asyncts: merge two conditions x86inc: fully concatenate tokens to fix macro expansion for nasm h264: initialize frame-mt context copies properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asyncts: merge two conditionsJustin Ruggles2012-12-13
| |
* | Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '072be3e8969f24113d599444be4d6a0ed04a6602': h264: set parameters from SPS whenever it changes asyncts: cosmetics: reindent Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asyncts: cosmetics: reindentJustin Ruggles2012-12-13
| |
* | Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e': doc: improve documentation for the asyncts filter first_pts option asyncts: fix the asyncts behavior when using the first_pts option Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asyncts: fix the asyncts behavior when using the first_pts optionJustin Ruggles2012-12-13
| | | | | | | | | | Currently it will do padding, but it does not properly handle start-of-stream trimming as documented.
* | Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | * commit '8083332c2de9ee189f96844ff4c2d9be1844116f': asyncts: use clipped delta value when setting resample compensation asyncts: fix flushing of final samples at EOF vp6: properly fail on unsupported feature Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asyncts: use clipped delta value when setting resample compensationJustin Ruggles2012-12-13
| | | | | | | | | | The max_comp option is supposed to limit maximum compensation, but currently the clipped value is not actually used.
| * asyncts: fix flushing of final samples at EOFJustin Ruggles2012-12-13
| |
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-28
| | | | | | | | | | Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
* | lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-28
| | | | | | | | | | Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-10
| | | | | | | | | | | | | | A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: change the type of the data buffers to uint8_t**.Anton Khirnov2012-10-05
| | | | | | | | | | | | This is more consistent with what the rest of Libav does. This breaks API.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov_chan: Pass a separate AVIOContext for reading af_asyncts: check return value from lavr when flushing. mss2: simplify loop in decode_rle() mss12: avoid unnecessary division in arith*_get_bit() mss2: do not try to read too many palette entries mpegvideo: set AVFrame fields to NULL after freeing the base memory configure: Set the right cc_e flags for msvc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_asyncts: check return value from lavr when flushing.Anton Khirnov2012-09-07
| | | | | | | | | | Fixes an infinite loop on flush when avresample_get_delay() still reports some samples but avresample_convert() doesn't return any data.
* | Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a': avopt: Explicitly store float/double option defaults in .dbl Conflicts: libavcodec/ac3dec.c libavcodec/libx264.c libavfilter/af_amix.c libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Explicitly store float/double option defaults in .dblMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: store defaults for INT64 options in int64 union member.Anton Khirnov2012-08-24
| | | | | | | | | | Double does not have enough precision to represent all int64 numbers exactly.
* | lavfi/asyncts: Fix compilation with GCC 4.7Thomas Weber2012-08-21
| | | | | | | | | | | | | | | | | | | | | | Compilation failed since commit 42d621d131a45fb63571ca6029c2fc4f02811c10 Error messages: libavfilter/af_asyncts.c:249:5: error: initializer element is not computable at load time libavfilter/af_asyncts.c:249:5: error: (near initialization for ‘avfilter_af_asyncts.priv_size’) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-18
| | | | | | | | | | This allows the iteration callbacks to discover the internal class and options, and show them when required.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Remove "Error parsing options string [...]" messages.Clément Bœsch2012-08-09
| | | | | | | | | | This reduces from 3 to 2 messages for the same syntax error in ffprobe, and from 4 to 3 in filters.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_asyncts: avoid overflow in out_size with large delta valuesJustin Ruggles2012-07-29
| |
| * af_asyncts: add first_pts optionJustin Ruggles2012-07-29
| | | | | | | | | | | | This allows for padding/trimming at the start of stream. By default, no assumption is made about the first frame's expected pts, so no padding or trimming is done.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss3: use standard zigzag table mss3: split DSP functions that are used in MTS2(MSS4) into separate file motion-test: do not use getopt() tcp: add initial timeout limit for incoming connections configure: Change the rdtsc check to a linker check avconv: propagate fatal errors from lavfi. lavfi: add error handling to filter_samples(). fate-run: make avconv() properly deal with multiple inputs. asplit: don't leak the input buffer. af_resample: fix request_frame() behavior. af_asyncts: fix request_frame() behavior. libx264: support aspect ratio switching matroskadec: honor error_recognition when encountering unknown elements. lavr: resampling: add support for s32p, fltp, and dblp internal sample formats lavr: resampling: add filter type and Kaiser window beta to AVOptions lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format lavr: mix: validate internal sample format in ff_audio_mix_init() Conflicts: ffmpeg.c ffplay.c libavcodec/libx264.c libavfilter/audio.c libavfilter/split.c libavformat/tcp.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add error handling to filter_samples().Anton Khirnov2012-07-09
| |
| * af_asyncts: fix request_frame() behavior.Anton Khirnov2012-07-09
| | | | | | | | | | Make sure that an output frame has really been produced before returning 0.
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-26
| | | | | | | | | | | | It is not used in any filters currently and is inherently evil. If passing binary data to filters is required in the future, it should be done with some AVOptions-based system.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 21:54:23 +0000