-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: ppc: drop stray leftover backslash build: Only clean the architecture subdirectory we build for. build: drop some unnecessary dependencies from the H.264 parser build: prettyprinting cosmetics libavutil: Remove pointless rational test program. libavutil: Remove broken and pointless lzo test program. lavf doxy: expand AVStream.codec doxy. lavf doxy: improve AVStream.time_base doxy. lavf doxy: add some basic documentation about reading from the demuxer. lavf doxy: document passing options to demuxers. lavf doxy: clarify that an AVPacket contains encoded data. mpegtsenc: allow user triggered PES packet flushing APIchanges: mark the place where 0.7 was cut. APIchanges: mark the place where 0.8 was cut. APIchanges: fill in missing dates and hashes. smacker: convert palette and header reading to bytestream2. alac: convert extradata reading to bytestream2. Conflicts: doc/APIchanges libavcodec/smacker.c libavcodec/x86/Makefile libavfilter/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
- Loading branch information
Showing
19 changed files
with
235 additions
and
150 deletions.
There are no files selected for viewing
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,6 +1,6 @@ | ||
OBJS += alpha/dsputil_alpha.o \ | ||
alpha/dsputil_alpha_asm.o \ | ||
alpha/motion_est_alpha.o \ | ||
alpha/motion_est_mvi_asm.o \ | ||
alpha/mpegvideo_alpha.o \ | ||
alpha/simple_idct_alpha.o \ | ||
OBJS += alpha/dsputil_alpha.o \ | ||
alpha/dsputil_alpha_asm.o \ | ||
alpha/motion_est_alpha.o \ | ||
alpha/motion_est_mvi_asm.o \ | ||
alpha/mpegvideo_alpha.o \ | ||
alpha/simple_idct_alpha.o \ |
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,7 +1,7 @@ | ||
OBJS += bfin/dsputil_bfin.o \ | ||
bfin/fdct_bfin.o \ | ||
bfin/idct_bfin.o \ | ||
bfin/mpegvideo_bfin.o \ | ||
bfin/pixels_bfin.o \ | ||
bfin/vp3_bfin.o \ | ||
bfin/vp3_idct_bfin.o \ | ||
OBJS += bfin/dsputil_bfin.o \ | ||
bfin/fdct_bfin.o \ | ||
bfin/idct_bfin.o \ | ||
bfin/mpegvideo_bfin.o \ | ||
bfin/pixels_bfin.o \ | ||
bfin/vp3_bfin.o \ | ||
bfin/vp3_idct_bfin.o \ |
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,3 +1,3 @@ | ||
OBJS += sh4/dsputil_align.o \ | ||
sh4/dsputil_sh4.o \ | ||
sh4/idct_sh4.o \ | ||
OBJS += sh4/dsputil_align.o \ | ||
sh4/dsputil_sh4.o \ | ||
sh4/idct_sh4.o \ |
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,2 +1,2 @@ | ||
OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ | ||
sparc/simple_idct_vis.o \ | ||
OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ | ||
sparc/simple_idct_vis.o \ |
Oops, something went wrong.