Merge commit '443502ae'

* commit '443502ae':
  dvbsubdec: move shared codepath

Conflicts:
	libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dvbsubdec.c

@@ -728,17 +728,10 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
                     return pixels_read;
                 }
 
-                if (map_table)
-                    bits = map_table[0];
-                else
                 bits = 0;
-                while (run_length-- > 0 && pixels_read < dbuf_len) {
-                    *destbuf++ = bits;
-                    pixels_read++;
-                }
             } else {
                 bits = *(*srcbuf)++;
-
+            }
             if (non_mod == 1 && bits == 1)
                 pixels_read += run_length;
             else {
@@ -751,7 +744,6 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
             }
         }
     }
-    }
 
     if (*(*srcbuf)++)
         av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n");