Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
re-sync FFmpeg to SHA:ea5dab58e074a91330e1f076a4cbe8fece889afe
- Loading branch information
Showing
1,022 changed files
with
42,300 additions
and
25,906 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,49 @@ | ||
This code was resynced upstream to: | ||
|
||
git://source.ffmpeg.org/ffmpeg.git at SHA1 d3db8988d on March 31, 2010 | ||
git://source.ffmpeg.org/ffmpeg.git at SHA1 d3db8988d on March 31, 2012 | ||
|
||
git://source.ffmpeg.org/ffmpeg.git at SHA1 ea5dab58e on May 23, 2012 | ||
|
||
List of files modified from original FFmpeg: | ||
Makefile | ||
README.sync | ||
common.mak | ||
configure | ||
libavcodec/Makefile | ||
libavcodec/avcodec.h | ||
libavcodec/dsputil.h | ||
libavcodec/dvbsub_parser.c | ||
libavcodec/dvbsubdec.c | ||
libavcodec/dvdsubdec.c | ||
libavcodec/get_bits.h | ||
libavcodec/golomb.h | ||
libavcodec/h264_refs.c | ||
libavcodec/libavcodec.v | ||
libavcodec/mpeg12.c | ||
libavcodec/mpeg4videodec.c | ||
libavcodec/mpeg4videoenc.c | ||
libavcodec/mpegaudio_parser.c | ||
libavcodec/mpegaudiodec.c | ||
libavcodec/mpegaudiodecheader.c | ||
libavcodec/mpegvideo.c | ||
libavcodec/mpegvideo.h | ||
libavcodec/myth_utils.c | ||
This comment has been minimized.
Sorry, something went wrong. |
||
libavcodec/pcm.c | ||
libavcodec/pgssubdec.c | ||
libavformat/Makefile | ||
libavformat/allformats.c | ||
libavformat/avformat.h | ||
libavformat/mpeg.c | ||
libavformat/mpeg.h | ||
libavformat/mpegts-mythtv.c <- new file | ||
libavformat/mpegts-mythtv.h <- new file | ||
libavformat/mpegts.c | ||
libavformat/mpegts.h | ||
libavformat/nuv.c <- could be ignored, whitespace only | ||
libavformat/utils-myth.c <- new file | ||
libavformat/utils.c | ||
libavresample/libavresample.v | ||
libavutil/bswap.h | ||
libpostproc/Makefile | ||
libpostproc/postprocess.c | ||
library.mak |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes) | ||
OBJS-$(HAVE_ARMV6) += $(ARMV6-OBJS) $(ARMV6-OBJS-yes) | ||
OBJS-$(HAVE_ARMVFP) += $(ARMVFP-OBJS) $(ARMVFP-OBJS-yes) | ||
OBJS-$(HAVE_NEON) += $(NEON-OBJS) $(NEON-OBJS-yes) | ||
|
||
OBJS-$(HAVE_MMI) += $(MMI-OBJS) $(MMI-OBJS-yes) | ||
|
||
OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes) | ||
|
||
OBJS-$(HAVE_VIS) += $(VIS-OBJS) $(VIS-OBJS-yes) | ||
|
||
OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes) | ||
OBJS-$(HAVE_YASM) += $(YASM-OBJS) $(YASM-OBJS-yes) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
This one should say it's a new file too