Skip to content

F
ffmpeg.wasm-core
Commit 54dd50d1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

cmdutils: remove outcommented merge trash 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 56e11d23
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 36 deletions
cmdutils.c
View file @ 54dd50d1
......@@ -388,44 +388,8 @@ int opt_default(const char *opt, const char *arg){
exit(1);
}
if (!o) {
//<<<<<<< HEAD
fprintf(stderr, "Unrecognized option '%s'\n", opt);
exit(1);
/*||||||| merged common ancestors
AVCodec *p = NULL;
AVOutputFormat *oformat = NULL;
while ((p=av_codec_next(p))){
const AVClass *c = p->priv_class;
if(c && av_find_opt(&c, opt, NULL, 0, 0))
break;
}
if (!p) {
while ((oformat = av_oformat_next(oformat))) {
const AVClass *c = oformat->priv_class;
if (c && av_find_opt(&c, opt, NULL, 0, 0))
break;
}
}
if(!p && !oformat){
fprintf(stderr, "Unrecognized option '%s'\n", opt);
exit(1);
}
=======
AVCodec *p = NULL;
AVOutputFormat *oformat = NULL;
while ((p=av_codec_next(p))){
const AVClass *c = p->priv_class;
if(c && av_opt_find(&c, opt, NULL, 0, 0))
break;
}
if (!p) {
while ((oformat = av_oformat_next(oformat))) {
const AVClass *c = oformat->priv_class;
if (c && av_opt_find(&c, opt, NULL, 0, 0))
break;
}
}
>>>>>>> qatar/master*/
}
out:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment