Skip to content
Commits on Aug 13, 2011
  1. @michaelni

    Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

    michaelni committed Aug 13, 2011
    * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
      Move x86util.asm from libavcodec/ to libavutil/.
      Move x86inc.asm to libavutil/.
      APIchanges: note error_recognition in lavf
      lavf: add support for error_recognition, use it in avidec, and bump minor API version
      avconv: change semantics of -map
      avconv: get rid of new* options.
      cmdutils: allow precisely specifying a stream for AVOptions.
      configure: add missing CFLAGS to fix building on the HURD
      libx264: Include hint for possible values for configuring libx264
      cmdutils: allow ':'-separated modifiers in option names.
      avconv: make -map_metadata work consistently with the other options
      avconv: remove deprecated options.
      avconv: make -map_chapters accept only the input file index.
      Make a copy of ffmpeg under a new name -- avconv.
      ffmpeg: add a warning stating that the program is deprecated.
      Add weighted motion compensation for RV40 B-frames
      RV3/4: calculate B-frame motion weights once per frame
      Move RV3/4-specific DSP functions into their own context
      mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
      h264: notice memory allocation failure
    
    Conflicts:
    	.gitignore
    	Makefile
    	cmdutils.c
    	configure
    	doc/ffplay.texi
    	doc/ffprobe.texi
    	doc/ffserver.texi
    	libavcodec/libx264.c
    	libavformat/avformat.h
    	libavformat/avidec.c
    	libavformat/version.h
    	tests/lavf-regression.sh
    	tests/lavfi-regression.sh
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 12, 2011
  1. @elenril

    Make a copy of ffmpeg under a new name -- avconv.

    elenril committed Jul 27, 2011
    It will be further developed with a few incompatible changes.
    
    ffmpeg.c will stay as is for some time, so any scripts using it won't be
    broken.
Commits on Aug 9, 2011
  1. @elenril

    Rename ffserver to avserver.

    elenril committed Jul 26, 2011
  2. @elenril

    Rename ffprobe to avprobe.

    elenril committed Jul 26, 2011
  3. @elenril

    Rename ffplay to avplay.

    elenril committed Jul 26, 2011
Commits on Jul 21, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jul 21, 2011
    * qatar/master:
      rv30: return AVERROR(EINVAL) instead of EINVAL
      build: add -L flags before existing LDFLAGS
      simple_idct: whitespace cosmetics
      simple_idct: make repeated code a macro
      dsputil: remove huge #if 0 block
      simple_idct: change 10-bit add/put stride from pixels to bytes
      dsputil: allow 9/10-bit functions for non-h264 codecs
      dnxhd: rename some data tables
      dnxhdenc: remove inline from function only called through pointer
      dnxhdenc: whitespace cosmetics
      swscale: mark YUV422P10(LE,BE) as supported for output
      configure: add -xc99 to LDFLAGS for Sun CC
      Remove unused and non-compiling vestigial g729 decoder
      Remove unused code under G729_BITEXACT #ifdef.
      mpegvideo: fix invalid picture unreferencing.
      dsputil: Remove extra blank line at end.
      dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
      simple_idct: add 10-bit version
    
    Conflicts:
    	Makefile
    	libavcodec/g729data.h
    	libavcodec/g729dec.c
    	libavcodec/rv30.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: Michael Niedermayer <michaelni@gmx.at>
  2. @mansr

    build: add -L flags before existing LDFLAGS

    mansr committed Jul 13, 2011
    This ensures the linker picks the just built libraries even
    if LDFLAGS for some reason contains -L flags pointing at
    other directories containing libav libraries.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jul 11, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jul 12, 2011
    * qatar/master:
      changelog: misc typo and wording fixes
      H.264: add filter_mb_fast support for >8-bit decoding
      doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
      lls: use av_lfg instead of rand() in test program
      build: remove unnecessary dependency on libs from 'all' target
      H.264: avoid redundant alpha/beta calculations in loopfilter
      H.264: optimize intra/inter loopfilter decision
      mpegts: fix Continuity Counter error detection
      build: remove unnecessary FFLDFLAGS variable
      vp8/mt: flush worker thread, not application thread context, on seek.
      mt: proper locking around release_buffer calls.
      DxVA2: unbreak build after [657ccb5]
      hwaccel: unbreak build
      Eliminate FF_COMMON_FRAME macro.
    
    Conflicts:
    	Changelog
    	Makefile
    	doc/developer.texi
    	libavcodec/avcodec.h
    	libavcodec/h264.c
    	libavcodec/mpeg4videodec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @mansr

    build: remove unnecessary dependency on libs from 'all' target

    mansr committed Jul 11, 2011
    The libs are added to the all target elsewhere, no need to do it
    again here.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  3. @mansr

    build: remove unnecessary FFLDFLAGS variable

    mansr committed Jul 10, 2011
    This variable is set to the same value for all directories.
    Adding the -L flags directly to LDFLAGS is simpler and achieves
    the same thing.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  4. @michaelni

    Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

    michaelni committed Jul 11, 2011
    * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
      swscale: fix crash with dithering due incorrect offset calculation.
      matroskadec: fix stupid typo (!= -> ==)
      build: remove duplicates from order-only directory prerequisite list
      build: rework rules for things in the tools dir
      configure: fix --cpu=host with gcc 4.6
      ARM: use const macro to define constant data in asm
      bitdepth: simplify FUNC/FUNCC macros
      dsputil: remove ff_emulated_edge_mc macro used in one place
      9/10-bit: simplify clipping macros
      matroskadec: reindent
      matroskadec: defer parsing of cues element until we seek.
      lavc: add support for codec-specific defaults.
      lavc: make avcodec_alloc_context3 officially public.
      lavc: remove a half-working attempt at different defaults for audio/video codecs.
      ac3dec: add a drc_scale private option
      lavf: add avformat_find_stream_info()
      lavc: introduce avcodec_open2() as a replacement for avcodec_open().
    
    Conflicts:
    	Makefile
    	libavcodec/utils.c
    	libavformat/avformat.h
    	libswscale/swscale_internal.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 10, 2011
  1. @mansr

    build: rework rules for things in the tools dir

    mansr committed Jul 10, 2011
    Declaring tools associated with each library in their respective
    makefiles allows these tools to easily depend on the correct
    prerequisites and link against the libs they need.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jul 5, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jul 5, 2011
    * qatar/master: (36 commits)
      ARM: allow unaligned buffer in fixed-point NEON FFT4
      fate: test more FFT etc sizes
      dca: set AVCodecContext frame_size for DTS audio
      YASM: Shut up unused variable compiler warning with --disable-yasm.
      x86_32: Fix build on x86_32 with --disable-yasm.
      iirfilter: add fate test
      doxygen: Add qmul docs.
      ogg: propagate return values and return more meaningful error values
      H.264: fix overreads of qscale_table
      Remove unused static tables and static inline functions.
      eval: clear Parser instances before using
      dct-test: remove 'ref' function pointer from tables
      build: Remove deleted 'check' target from .PHONY list.
      oggdec: Abort Ogg header parsing when encountering a data packet.
      Add LGPL license boilerplate to files lacking it.
      mxfenc: small typo fix
      doxygen: Fix documentation for some VP8 functions.
      sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
      des: allow unaligned input and output buffers
      aes: allow unaligned input and output buffers
      ...
    
    Conflicts:
    	libavcodec/dct-test.c
    	libavcodec/libvpxenc.c
    	libavcodec/x86/dsputil_mmx.c
    	libavcodec/x86/h264_qpel_mmx.c
    	libavfilter/x86/gradfun.c
    	libavformat/oggdec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 4, 2011
  1. @DonDiego
Commits on Jul 1, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jul 1, 2011
    * qatar/master:
      cosmetics: fix some then/than typos
      doxygen: Include libavcodec and libavformat examples into the documentation
      avutil: elaborate documentation for av_get_random_seed
      Add support for aac streams in mp4/mov without extradata.
      aes: whitespace cosmetics
      adler32: whitespace cosmetics
      swscale: fix another yuv range conversion overflow in 16bit scaling.
      Fix cpu flags test program
      opt-test: Add missing braces to silence compiler warnings.
      build: Eliminate obsolete test targets.
      udp: Fix a compilation warning
      swscale: Unbreak build with --enable-small
      base64: add fate test
      aes: improve test program and add fate test
      adler32: make test program more useful and add fate test
      swscale: fix yuv range correction when using 16-bit scaling.
      aacenc: Make chan_map const correct
    
    Conflicts:
    	Makefile
    	doc/examples/muxing-example.c
    	libavformat/udp.c
    	libavutil/random_seed.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 30, 2011
  1. @DonDiego

    build: Eliminate obsolete test targets.

    DonDiego committed Jun 25, 2011
    The targets are now part of FATE and can be run as individual FATE targets.
  2. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jun 30, 2011
    * 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: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 29, 2011
  1. @rdoeffinger
  2. @mansr

    build: fix creation of tools dir with make 3.81

    mansr committed Jun 29, 2011
    GNU make 3.81 apparently does not support order-only prerequisites
    with pattern rules, and thus fails to create the tools directory
    if it is missing.  Naming the objects explicitly in the rule makes
    it work properly.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  3. @DonDiego
  4. @mansr

    build: create output directories as needed

    mansr committed Jun 28, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  5. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jun 29, 2011
    * qatar/master: (21 commits)
      swscale: Add Doxygen for hyscale_fast/hScale.
      fate: enable lavfi-pixmt tests on big endian systems
      PPC: swscale: disable altivec functions for unsupported formats
      fate: merge identical pixdesc_be/le tests
      swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
      build: call texi2pod.pl with full path instead of symlink
      build: include sub-makefiles using full path instead of symlinks
      swscale: update big endian reference values after dff5a83.
      wavpack: skip blocks with no samples
      cosmetics: remove outdated comment that is no longer true
      build: replace some addprefix/addsuffix with substitution refs
      avutil: Remove unused arbitrary precision integer code.
      configure: Drop check for availability of ten assembler operands.
      aacenc: Save channel configuration for later use.
      aacenc: Fix codebook trellising for zeroed bands.
      swscale: change prototypes of scaled YUV output functions.
      swscale: re-add support for non-native endianness.
      swscale: disentangle yuv2rgbX_c_full() into small functions.
      swscale: split yuv2packed[12X]_c() remainders into small functions.
      swscale: split yuv2packedX_altivec in smaller functions.
      ...
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/Makefile
    	libavformat/Makefile
    	libavutil/integer.c
    	libavutil/integer.h
    	libswscale/swscale.c
    	libswscale/swscale_internal.h
    	libswscale/x86/swscale_template.c
    	tests/ref/lavfi/pixdesc_le
    	tests/ref/lavfi/pixfmts_scale
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 28, 2011
  1. @mansr

    build: include sub-makefiles using full path instead of symlinks

    mansr committed Jun 28, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 26, 2011
  1. @mansr

    build: factor out the .c and .S compile commands as a macro

    mansr committed Jun 25, 2011
    These commands have the same form, and using a common macro allows
    it to be used elsewhere without further duplication.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 25, 2011
  1. @rdoeffinger

    Restore some more rules to common.mak to improve building in subdirs.

    rdoeffinger committed Jun 24, 2011
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commits on Jun 24, 2011
  1. @rdoeffinger
  2. @rdoeffinger

    Revert "build: move basic rules and variables to main Makefile"

    rdoeffinger committed Jun 24, 2011
    This reverts commit bb52492.
    This is necessary to allow running "make" in subdirs again.
    
    Conflicts:
    
    	Makefile
  3. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jun 24, 2011
    * qatar/master:
      doxygen: Consistently use '@' instead of '\' for Doxygen markup.
      Use av_printf_format to check the usage of printf style functions
      Add av_printf_format, for marking printf style format strings and their parameters
      ARM: enable thumb for Cortex-M* CPUs
      nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
      build: remove SRC_PATH_BARE variable
      build: move basic rules and variables to main Makefile
      build: move special targets to end of main Makefile
      lavdev: improve feedback in case of invalid frame rate/size
      vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
      v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
      fbdev: prefer "framerate_q" over "fps" in device context
      bktr: prefer "framerate" over "fps" for grab_read_header()
      ALSA: implement channel layout for playback.
      alsa: support unsigned variants of already supported signed formats.
      alsa: add support for more formats.
      ARM: allow building in Thumb2 mode
    
    Conflicts:
    	common.mak
    	doc/APIchanges
    	libavcodec/vdpau.h
    	libavdevice/alsa-audio-common.c
    	libavdevice/fbdev.c
    	libavdevice/libdc1394.c
    	libavutil/avutil.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 23, 2011
  1. @mansr

    build: remove SRC_PATH_BARE variable

    mansr committed Jun 6, 2011
    Setting SRC_PATH to "." when building in-tree removes the need
    for a quoted version of the source path since out-of-tree builds
    are not possible if the pathname contains spaces.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @mansr

    build: move basic rules and variables to main Makefile

    mansr committed Jun 5, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  3. @mansr

    build: move special targets to end of main Makefile

    mansr committed Jun 6, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  4. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jun 23, 2011
    * qatar/master:
      configure: add --optflags option
      build: move documentation rules to doc/Makefile
      build: move test rules to tests/Makefile
      ac3enc: remove unneeded local variable in asym_quant()
      ac3enc: remove a branch in asym_quant() by doing 2 shifts
      ac3enc: avoid masking output in asym_quant() by using signed values for quantized mantissas.
      H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
      H.264: fix 4:4:4 + deblocking + MBAFF
      H.264: fix 4:4:4 cropping warning
      H.264: reference the correct SPS in decode_scaling_matrices
      H.264: fix bug in lossless 4:4:4 decoding
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 22, 2011
  1. @mansr

    build: move documentation rules to doc/Makefile

    mansr committed Jun 6, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @mansr

    build: move test rules to tests/Makefile

    mansr committed Jun 6, 2011
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 15, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed Jun 15, 2011
    * qatar/master:
      swscale: remove misplaced comment.
      ffmpeg: fix streaming to ffserver.
      swscale: split out RGB48 output functions from yuv2packed[12X]_c().
      build: move vpath directives to main Makefile
      swscale: fix JPEG-range YUV scaling artifacts.
      build: move ALLFFLIBS to a more logical place
      ARM: factor some repetitive code into macros
      Fix SVQ3 after adding 4:4:4 H.264 support
      H.264: fix CODEC_FLAG_GRAY
      4:4:4 H.264 decoding support
      ac3enc: fix allocation of floating point samples.
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/dsputil_template.c
    	libavcodec/h264.c
    	libavcodec/mpegvideo.c
    	libavcodec/snow.c
    	libswscale/swscale.c
    	libswscale/swscale_internal.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Something went wrong with that request. Please try again.