• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8c0cbb08
    Michael Niedermayer authored
    * qatar/master:
      rational-test: Add proper main() declaration to fix gcc warnings.
      configure: Add vdpau and dxva2 to configure results output.
      Remove unused, never built libavutil/pca.[ch]
      matroskadec: forward parsing errors to caller.
      av_find_stream_info: simplify EAGAIN handling.
      aacenc: Fix determination of Mid/Side Mode.
      psymodel: Remove the single channel analysis function
      aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
      psymodel: Add channels and channel groups to the psymodel.
      ARM: remove check for PLD instruction
      fate: move amr[nw]b test rules into separate files
      ogg: fix double free when finding length of small chained oggs.
      swscale: implement >8bit scaling support.
      build: fix creation of tools dir with make 3.81
      build: Mark all-yes Makefile target as phony.
      pixfmt: fix YUV422/444 wrong endian comment
      build: create output directories as needed
      Add new yuv444 pixfmts to avcodec_align_dimensions2
    
    Conflicts:
    	Makefile
    	configure
    	libavutil/pca.c
    	libavutil/pca.h
    	libavutil/pixfmt.h
    	libswscale/swscale.c
    	libswscale/utils.c
    	libswscale/x86/swscale_template.c
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8c0cbb08
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
ffserver.h Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...