> 在 2019年10月30日，17:55，Paul B Mahol <[email protected]> 写道：
>
> Can not be applied, patch is corrupted.
Yes
liuqideMBP:ffmpeg_up liuqi$ git am
~/Downloads/FFmpeg-devel-doc-fix-typo-in-muxers-documentation.patch
Applying: doc: fix typo in muxers documentation
.git/rebase-apply/patch:16: trailing whitespace.
single character indicating the type of stream, @var{algo} is a short
error: corrupt patch at line 17
Patch failed at 0001 doc: fix typo in muxers documentation
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
liuqideMBP:ffmpeg_up liuqi$
>
> On 10/30/19, Alfred E. Heggestad <[email protected]> wrote:
>> Signed-off-by: Alfred E. Heggestad <[email protected]>
>> ---
>> doc/muxers.texi | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/doc/muxers.texi b/doc/muxers.texi
>> index 4c88b5daec..09ded7d48a 100644
>> --- a/doc/muxers.texi
>> +++ b/doc/muxers.texi
>> @@ -2084,7 +2084,7 @@ but supports several other algorithms.
>> The output of the muxer consists of one line per stream of the form:
>> @var{streamindex},@var{streamtype},@var{algo}=@var{hash}, where
>> @var{streamindex} is the index of the mapped stream, @var{streamtype} is a
>> -single characer indicating the type of stream, @var{algo} is a short string
>> +single character indicating the type of stream, @var{algo} is a short
>> string
>> representing the hash function used, and @var{hash} is a hexadecimal
>> number
>> representing the computed hash.
>>
>> --
>> 2.20.1 (Apple Git-117)
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> [email protected]
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> [email protected] with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> [email protected]
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> [email protected] with subject "unsubscribe".
Thanks
Steven
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
