From 54dd50d14dc3a3952f7d85165142d02f6ea578d7 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 20 Jun 2011 13:22:23 +0200
Subject: [PATCH] cmdutils: remove outcommented merge trash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 cmdutils.c | 36 ------------------------------------
 1 file changed, 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: