mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-05 14:26:17 +00:00
cmdutils: remove outcommented merge trash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
56e11d2305
commit
54dd50d14d
36
cmdutils.c
36
cmdutils.c
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user