On Wed, Oct 19, 2016 at 02:35:21PM +0200, Tobias Rapp wrote: > From: Rodger Combs <rodger.co...@gmail.com> > > Reviewed-by: Tobias Rapp <t.r...@noa-archive.com> > --- > doc/ffprobe.xsd | 1 + > ffprobe.c | 13 +++++++++++++ > tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 2 +- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 2 +- > tests/ref/fate/concat-demuxer-simple2-lavf-ts | 2 +- > tests/ref/fate/ffprobe_compact | 4 ++-- > tests/ref/fate/ffprobe_csv | 4 ++-- > tests/ref/fate/ffprobe_default | 2 ++ > tests/ref/fate/ffprobe_flat | 2 ++ > tests/ref/fate/ffprobe_ini | 2 ++ > 12 files changed, 29 insertions(+), 9 deletions(-)
This too doesnt apply: Applying: ffprobe: report field order for video streams Using index info to reconstruct a base tree... error: patch failed: tests/ref/fate/ffprobe_compact:27 error: tests/ref/fate/ffprobe_compact: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel