[FFmpeg-cvslog] ffprobe: exit in case generic options are incompatible with strict XML output

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jan  5 10:51:28 2012 +0100| [c5f4abf698f6a52db2eb7a27c7560fc0f8a33b5f] | committer: Stefano Sabatini

ffprobe: exit in case generic options are incompatible with strict XML output

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5f4abf698f6a52db2eb7a27c7560fc0f8a33b5f
---

 ffprobe.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index 77c343a..34626a8 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -926,6 +926,7 @@ static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque)
             av_log(wctx, AV_LOG_ERROR,                                  \
                    "XSD-compliant output selected but option '%s' was selected, XML output may be non-compliant.\n" \
                    "You need to disable such option with '-no%s'\n", opt_name, opt_name); \
+            return AVERROR(EINVAL);                                     \
         }
         CHECK_COMPLIANCE(show_private_data, "private");
         CHECK_COMPLIANCE(show_value_unit,   "unit");