Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'

* commit '83b92a855e8e08bdec484e13ee5a7c8996224772':
  golomb: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>

libavcodec/golomb.h

@@ -489,19 +489,9 @@ static inline void set_te_golomb(PutBitContext *pb, int i, int range)
  */
 static inline void set_se_golomb(PutBitContext *pb, int i)
 {
-#if 0
-    if (i <= 0)
-        i = -2 * i;
-    else
-        i = 2 * i - 1;
-#elif 1
     i = 2 * i - 1;
     if (i < 0)
         i ^= -1;    //FIXME check if gcc does the right thing
-#else
-    i  = 2 * i - 1;
-    i ^= (i >> 31);
-#endif
     set_ue_golomb(pb, i);
 }