diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-20 13:22:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-20 13:22:23 +0200 |
| commit | 54dd50d14dc3a3952f7d85165142d02f6ea578d7 (patch) | |
| tree | d91ada2dbd1394e4bfa1f16534a993fd16dc7e4f | |
| parent | 56e11d230525bb9659e79d3253351b94ec3f8478 (diff) | |
| download | ffmpeg-54dd50d14dc3a3952f7d85165142d02f6ea578d7.tar.gz | |
cmdutils: remove outcommented merge trash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/cmdutils.c b/cmdutils.c index c3c5c0efa9..cd6d13346d 100644 --- a/cmdutils.c +++ b/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: |