Re: [FFmpeg-devel] Start of SCTE-35 support [PATCH]

2016-07-08 Thread Michael Niedermayer
On Wed, Jul 06, 2016 at 04:48:30PM -0700, Carlos Fernandez Sanz wrote: > Hi, > > Apologies for resending - gmail sent the first attempt as a binary attachment. fatal: corrupt patch at line 14 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch

[FFmpeg-devel] Start of SCTE-35 support [PATCH]

2016-07-06 Thread Carlos Fernandez Sanz
Hi, Apologies for resending - gmail sent the first attempt as a binary attachment. This patch starts the work on SCTE-35 support; for now it just detects SCTE-35 and if present sends the data to a dummy function. Since it's my first contribution to ffmpeg I preferred to start small and continue w

[FFmpeg-devel] Start of SCTE-35 support [PATCH]

2016-07-06 Thread Carlos Fernandez Sanz
Hi, This patch starts the work on SCTE-35 support; for now it just detects SCTE-35 and if present sends the data to a dummy function. Since it's my first contribution to ffmpeg I preferred to start small and continue working as small pieces of work are accepted or commented. Carlos 0001-SCTE-ex