Merge remote-tracking branch 'upstream/master'

ShiftMediaProject · Mar 22, 2019 · e86d203 · e86d203
2 parents 92f9383 + d4099dd
commit e86d203
Show file tree

Hide file tree

Showing 200 changed files with 1,482 additions and 1,036 deletions.
diff --git a/Makefile b/Makefile
@@ -27,8 +27,8 @@ SRCS_X = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
 
 SRCS_8 =
 
-SRCCLI = x264.c input/input.c input/timecode.c input/raw.c input/y4m.c \
-         output/raw.c output/matroska.c output/matroska_ebml.c \
+SRCCLI = x264.c autocomplete.c input/input.c input/timecode.c input/raw.c \
+         input/y4m.c output/raw.c output/matroska.c output/matroska_ebml.c \
          output/flv.c output/flv_bytestream.c filters/filters.c \
          filters/video/video.c filters/video/source.c filters/video/internal.c \
          filters/video/resize.c filters/video/fix_vfr_pts.c \