On Fri, Jul 29, 2016 at 12:36:21PM -0500, Burt P wrote: > Issue #5727: gain adjustment should only be applied if matching > gain value from a valid packet in both channels. The existing functions > process > each channel separately, so it was not possible. > > * New versions of hdcd_process(), hdcd_scan(), hdcd_integrate() named > hdcd_*_stereo() that process both channels together. > * target_gain applied will be the last matching target_gain. > * The old single channel functions remain as an option. They can be > used by: -af hdcd=process_stereo=0. > > Signed-off-by: Burt P <pbu...@gmail.com> > --- > libavfilter/af_hdcd.c | 287 > +++++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 250 insertions(+), 37 deletions(-)
doesnt want to apply Applying: af_hdcd: Process stereo channels together, fix #5727 fatal: sha1 information is lacking or useless (libavfilter/af_hdcd.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 af_hdcd: Process stereo channels together, fix #5727 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Dictatorship: All citizens are under surveillance, all their steps and actions recorded, for the politicians to enforce control. Democracy: All politicians are under surveillance, all their steps and actions recorded, for the citizens to enforce control.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
