Re: [FFmpeg-devel] [PATCH 2/3] lavf: add and use AVRTCPSenderReport struct

[Marvin Scholz <epirat07-at-gmail.com@ffmpeg.org>]

On 27 Jun 2025, at 23:50, Michael Niedermayer wrote:

> On Tue, Jun 24, 2025 at 08:02:01PM +0200, Marvin Scholz wrote:
>> This will be used in a future commit to expose the SR as side-data.
>> ---
>>  libavcodec/defs.h     | 14 ++++++++++++++
>>  libavformat/rtpdec.c  | 34 ++++++++++++++++++++--------------
>>  libavformat/rtpdec.h  |  4 ++--
>>  libavformat/rtspdec.c |  2 +-
>>  4 files changed, 37 insertions(+), 17 deletions(-)
>
> this seems not to apply
>

Indeed, sent a new version rebased on recent master.

> git am -3
> Applying: lavf: add and use AVRTCPSenderReport struct
> error: sha1 information is lacking or useless (libavformat/rtpdec.c).
> error: could not build fake ancestor
> Patch failed at 0001 lavf: add and use AVRTCPSenderReport struct
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config set advice.mergeConflict false"
>
>
> git am --show-current-patch=diff | patch -p1 --dry-run  -F9
> checking file libavcodec/defs.h
> checking file libavformat/rtpdec.c
> Hunk #4 FAILED at 602.
> Hunk #5 FAILED at 622.
> 2 out of 5 hunks FAILED
> checking file libavformat/rtpdec.h
> checking file libavformat/rtspdec.c
>
>
> [...]
> -- 
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Many things microsoft did are stupid, but not doing something just because
> microsoft did it is even more stupid. If everything ms did were stupid they
> would be bankrupt already.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".