[FFmpeg-devel] [PATCH] lavf: add ffprobe demuxer
Michael Niedermayer
michael at niedermayer.cc
Mon Sep 5 00:25:56 EEST 2016
On Sun, Sep 04, 2016 at 06:24:37PM +0200, Stefano Sabatini wrote:
> From: Nicolas George <george at nsup.org>
>
> With several modifications and documentation by Stefano Sabatini
> <stefasab at gmail.com>.
>
> Signed-off-by: Nicolas George <george at nsup.org>
> ---
> doc/ffprobe-format.texi | 130 ++++++++++++++++
> libavformat/Makefile | 1 +
> libavformat/allformats.c | 2 +
> libavformat/ffprobedec.c | 397 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 530 insertions(+)
> create mode 100644 doc/ffprobe-format.texi
> create mode 100644 libavformat/ffprobedec.c
this seems not to apply cleanly
can i pick this from some git repo ? (should work better than patch
with unavailable ancestors)
Applying: lavf: add ffprobe demuxer
.git/rebase-apply/patch:16: trailing whitespace.
@chapter ffprobe demuxer format
fatal: sha1 information is lacking or useless (libavformat/Makefile).
error: could not build fake ancestor
Patch failed at 0001 lavf: add ffprobe demuxer
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".
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The real ebay dictionary, page 3
"Rare item" - "Common item with rare defect or maybe just a lie"
"Professional" - "'Toy' made in china, not functional except as doorstop"
"Experts will know" - "The seller hopes you are not an expert"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160904/a6ce821c/attachment.sig>
More information about the ffmpeg-devel
mailing list