Updating Opus to release 1.1

src/repacketizer_demo.c

 /* Copyright (c) 2011 Xiph.Org Foundation
    Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
@@ skipping 63 matching lines @@
    for (i=1;i<argc-2;i++)
    {
       if (strcmp(argv[i], "-merge")==0)
       {
          merge = atoi(argv[i+1]);
          if(merge<1)
          {
             fprintf(stderr, "-merge parameter must be at least 1.\n");
             return EXIT_FAILURE;
          }
+         if(merge>48)
+         {
+            fprintf(stderr, "-merge parameter must be less than 48.\n");
+            return EXIT_FAILURE;
+         }
          i++;
       } else if (strcmp(argv[i], "-split")==0)
          split = 1;
       else
       {
          fprintf(stderr, "Unknown option: %s\n", argv[i]);
          usage(argv[0]);
          return EXIT_FAILURE;
       }
    }
@@ skipping 109 matching lines @@
             }
 
          }
       }
    }
 
    fclose(fin);
    fclose(fout);
    return EXIT_SUCCESS;
 }