Skip to content

Commit

Permalink
Revert "libavformat: add mvcC handling in .mov/.mp4"
Browse files Browse the repository at this point in the history
This reverts commit 34f0522.
  • Loading branch information
popcornmix committed Sep 16, 2015
1 parent 0c71e0e commit 218c5de
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 60 deletions.

This file was deleted.

4 changes: 1 addition & 3 deletions tools/depends/target/ffmpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ include ../../Makefile.include
include FFMPEG-VERSION
DEPS= ../../Makefile.include FFMPEG-VERSION Makefile ffmpeg_Speed_up_wtv_index_creation.patch \
0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \
0001-Discard-data-before-VO-VOL-in-mpeg-4-over-mpegts.patch \
0001-libavformat-add-mvcC-handling-in-.mov-.mp4.patch
0001-Discard-data-before-VO-VOL-in-mpeg-4-over-mpegts.patch

# set to "yes" to enable patching
# we don't apply patches until we move to a vanilla ffmpeg tarball
Expand Down Expand Up @@ -80,7 +79,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); patch -p1 < ../ffmpeg_Speed_up_wtv_index_creation.patch
cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch
cd $(PLATFORM); patch -p1 < ../0001-Discard-data-before-VO-VOL-in-mpeg-4-over-mpegts.patch
cd $(PLATFORM); patch -p1 < ../0001-libavformat-add-mvcC-handling-in-.mov-.mp4.patch
cd $(PLATFORM);\
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure $(ffmpg_config)
Expand Down

0 comments on commit 218c5de

Please sign in to comment.