ffmpeg.git
5 years agoffprobe: fix format section XML validation
Stefano Sabatini [Sun, 1 Sep 2013 09:28:56 +0000 (11:28 +0200)]
ffprobe: fix format section XML validation

It was broken since 2186a7e547fdda716138444c8345ce8b823f2d4a.

5 years agoavcodec/h264: set er.ref_count earlier
Michael Niedermayer [Sun, 1 Sep 2013 01:40:20 +0000 (03:40 +0200)]
avcodec/h264: set er.ref_count earlier

Fixes Ticket2910

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: change out commented printf() to av_log()
Michael Niedermayer [Sun, 1 Sep 2013 01:44:19 +0000 (03:44 +0200)]
avcodec/error_resilience: change out commented printf() to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: fix duration_fields calculation when need_parsing=0
Michael Niedermayer [Sat, 31 Aug 2013 22:46:14 +0000 (00:46 +0200)]
avformat/utils: fix duration_fields calculation when need_parsing=0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/lxfdec: use a parser to parse video frame headers
Michael Niedermayer [Sat, 31 Aug 2013 22:21:37 +0000 (00:21 +0200)]
avformat/lxfdec: use a parser to parse video frame headers

lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: avcodec_string: print colorspace type
Michael Niedermayer [Tue, 27 Aug 2013 20:04:38 +0000 (22:04 +0200)]
avcodec/utils: avcodec_string: print colorspace type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: avcodec_string: Print color_range
Michael Niedermayer [Tue, 27 Aug 2013 20:04:00 +0000 (22:04 +0200)]
avcodec/utils: avcodec_string: Print color_range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: avcodec_string: make the colorspace printing code more extendible.
Michael Niedermayer [Tue, 27 Aug 2013 20:02:45 +0000 (22:02 +0200)]
avcodec/utils: avcodec_string: make the colorspace printing code more extendible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 31 Aug 2013 11:55:34 +0000 (13:55 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 31 Aug 2013 11:47:04 +0000 (13:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
libavcodec/pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'
Michael Niedermayer [Sat, 31 Aug 2013 11:35:52 +0000 (13:35 +0200)]
Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix make checkheaders for wavpackenc.h
Carl Eugen Hoyos [Sat, 31 Aug 2013 11:32:43 +0000 (13:32 +0200)]
Fix make checkheaders for wavpackenc.h

5 years agoFix make checkheaders for vdpau_internal.h
Carl Eugen Hoyos [Sat, 31 Aug 2013 11:32:13 +0000 (13:32 +0200)]
Fix make checkheaders for vdpau_internal.h

5 years agopcm_bluray: cosmetics
Christian Schmidt [Fri, 30 Aug 2013 16:15:46 +0000 (18:15 +0200)]
pcm_bluray: cosmetics

5 years agopcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
Christian Schmidt [Fri, 30 Aug 2013 16:15:44 +0000 (18:15 +0200)]
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.

5 years agoavformat/avidec: match first index and first packet size=0 handling
Michael Niedermayer [Sat, 31 Aug 2013 01:08:25 +0000 (03:08 +0200)]
avformat/avidec: match first index and first packet size=0 handling

Fixes Ticket2861

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dsputil: fix signedness in sizeof() comparissions
Michael Niedermayer [Fri, 30 Aug 2013 21:40:47 +0000 (23:40 +0200)]
avcodec/dsputil: fix signedness in sizeof() comparissions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdsp: fix (un)signed type in end comparission
Michael Niedermayer [Fri, 30 Aug 2013 21:14:32 +0000 (23:14 +0200)]
avcodec/pngdsp: fix (un)signed type in end comparission

Fixes out of array accesses
Fixes Ticket2919

Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/bprint: add append buffer function
Lukasz Marek [Fri, 23 Aug 2013 21:21:50 +0000 (23:21 +0200)]
lavu/bprint: add append buffer function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reveiwed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket: Use av_free_packet() in error cleanups
Michael Niedermayer [Fri, 30 Aug 2013 18:57:55 +0000 (20:57 +0200)]
avcodec/avpacket: Use av_free_packet() in error cleanups

This prevents memleaks on errors
reproduceable with fate when error pathes are forced

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovformat/subtitles: check av_copy_packets return code
Michael Niedermayer [Fri, 30 Aug 2013 18:57:04 +0000 (20:57 +0200)]
vformat/subtitles: check av_copy_packets return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agokgv1dec: remove unused avctx from codec private context
Paul B Mahol [Fri, 30 Aug 2013 13:16:50 +0000 (13:16 +0000)]
kgv1dec: remove unused avctx from codec private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agokgv1dec: make decoder independent of sizeof(AVFrame)
Paul B Mahol [Fri, 30 Aug 2013 13:14:58 +0000 (13:14 +0000)]
kgv1dec: make decoder independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agownv1: remove unused avctx from codec private context
Paul B Mahol [Fri, 30 Aug 2013 13:31:06 +0000 (13:31 +0000)]
wnv1: remove unused avctx from codec private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/pngdec: fix last_row_size type
Michael Niedermayer [Fri, 30 Aug 2013 14:20:33 +0000 (16:20 +0200)]
avcodec/pngdec: fix last_row_size type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: Fix padded alloc code with threads
Michael Niedermayer [Fri, 30 Aug 2013 14:06:05 +0000 (16:06 +0200)]
avcodec/pngdec: Fix padded alloc code with threads

Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoReinstate proper FFmpeg license for all files.
Thilo Borgmann [Thu, 15 Aug 2013 21:12:51 +0000 (23:12 +0200)]
Reinstate proper FFmpeg license for all files.

5 years agoFix compilation with --disable-mmx.
Carl Eugen Hoyos [Fri, 30 Aug 2013 13:21:15 +0000 (15:21 +0200)]
Fix compilation with --disable-mmx.

5 years agocmdutils: silence warning about incompatible pointer types
Paul B Mahol [Fri, 30 Aug 2013 10:39:27 +0000 (10:39 +0000)]
cmdutils: silence warning about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/mpegvideo: reduce log level for messages about allocating frames.
Michael Niedermayer [Fri, 30 Aug 2013 12:20:59 +0000 (14:20 +0200)]
avcodec/mpegvideo: reduce log level for messages about allocating frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers
Michael Niedermayer [Fri, 30 Aug 2013 04:08:32 +0000 (06:08 +0200)]
ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Aug 2013 10:57:58 +0000 (12:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e998b56362c711701b3daa34e7b956e7126336f4'
Michael Niedermayer [Fri, 30 Aug 2013 10:49:54 +0000 (12:49 +0200)]
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/lpc: Fix cpu flag checks so they work
Michael Niedermayer [Fri, 30 Aug 2013 10:32:54 +0000 (12:32 +0200)]
avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/vp8dsp: Fix cpu flag checks so they work
Michael Niedermayer [Fri, 30 Aug 2013 10:32:54 +0000 (12:32 +0200)]
avcodec/x86/vp8dsp: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
Michael Niedermayer [Fri, 30 Aug 2013 10:08:28 +0000 (12:08 +0200)]
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'
Michael Niedermayer [Fri, 30 Aug 2013 09:57:29 +0000 (11:57 +0200)]
Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: don't return a value from a function declared void
Sean McGovern [Thu, 29 Aug 2013 14:39:31 +0000 (10:39 -0400)]
ppc: don't return a value from a function declared void

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'a6b650118543e1580e872896d8976042b7c32d01'
Michael Niedermayer [Fri, 30 Aug 2013 09:48:50 +0000 (11:48 +0200)]
Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: reformat and add some clarification in libtwolame doc
Timothy Gu [Sat, 3 Aug 2013 23:55:40 +0000 (16:55 -0700)]
doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/encoders: reformat libmp3lame doc
Timothy Gu [Sat, 3 Aug 2013 23:51:26 +0000 (16:51 -0700)]
doc/encoders: reformat libmp3lame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoffv1dec: check that global parameters dont change in version 0/1
Michael Niedermayer [Fri, 30 Aug 2013 02:51:09 +0000 (04:51 +0200)]
ffv1dec: check that global parameters dont change in version 0/1

Such changes are not allowed nor supported

Fixes Ticket2906

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: check global header version
Michael Niedermayer [Fri, 30 Aug 2013 01:43:49 +0000 (03:43 +0200)]
avcodec/ffv1dec: check global header version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: Dont incorrectly warn about missing keyframes
Michael Niedermayer [Thu, 29 Aug 2013 23:45:11 +0000 (01:45 +0200)]
avcodec/mpegvideo: Dont incorrectly warn about missing keyframes

Files starting with B frames in presentation order generated the
"no keyframe" warning before this change.

Based on patch by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: don't return a value from a function declared void
Sean McGovern [Thu, 29 Aug 2013 14:39:31 +0000 (10:39 -0400)]
ppc: don't return a value from a function declared void

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agosnow: Check av_frame_alloc() failures
Michael Niedermayer [Thu, 29 Aug 2013 21:23:22 +0000 (23:23 +0200)]
snow: Check av_frame_alloc() failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: gray support
Michael Niedermayer [Thu, 29 Aug 2013 20:06:07 +0000 (22:06 +0200)]
avcodec/snow: gray support

Fixes Ticket839

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/snow: add gray/alpha/gbr
Michael Niedermayer [Thu, 29 Aug 2013 20:05:08 +0000 (22:05 +0200)]
doc/snow: add gray/alpha/gbr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: support non edge emu for grayscale
Michael Niedermayer [Thu, 29 Aug 2013 20:45:16 +0000 (22:45 +0200)]
avcodec/utils: support non edge emu for grayscale

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability
Michael Niedermayer [Sun, 10 Mar 2013 22:43:52 +0000 (23:43 +0100)]
libavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove now unneeded include <assert.h>
Michael Niedermayer [Thu, 29 Aug 2013 15:05:11 +0000 (17:05 +0200)]
avcodec/snowenc: remove now unneeded include <assert.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: convert all asserts to av_asserts
Michael Niedermayer [Thu, 29 Aug 2013 15:04:37 +0000 (17:04 +0200)]
avcodec/snowenc: convert all asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosnowenc: remove disabled QUANTIZE2 code
Michael Niedermayer [Thu, 29 Aug 2013 14:59:26 +0000 (16:59 +0200)]
snowenc: remove disabled QUANTIZE2 code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 29 Aug 2013 14:15:50 +0000 (16:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'
Michael Niedermayer [Thu, 29 Aug 2013 14:09:46 +0000 (16:09 +0200)]
Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'
Michael Niedermayer [Thu, 29 Aug 2013 14:05:01 +0000 (16:05 +0200)]
Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'
Michael Niedermayer [Thu, 29 Aug 2013 14:00:40 +0000 (16:00 +0200)]
Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'

* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'
Michael Niedermayer [Thu, 29 Aug 2013 13:54:14 +0000 (15:54 +0200)]
Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e0799a4d04404abfa8fbc072640be76465158cf'
Michael Niedermayer [Thu, 29 Aug 2013 13:48:49 +0000 (15:48 +0200)]
Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf'

* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
  swscale: Add some missing av_cold to arch-specific init functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3aa682f25324d811ec284edc808eb71a46eae950'
Michael Niedermayer [Thu, 29 Aug 2013 13:41:00 +0000 (15:41 +0200)]
Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

* commit '3aa682f25324d811ec284edc808eb71a46eae950':
  swscale: consistent names for arch-specific acceleration functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
Michael Niedermayer [Thu, 29 Aug 2013 13:10:09 +0000 (15:10 +0200)]
Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'

* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8'
Michael Niedermayer [Thu, 29 Aug 2013 13:04:34 +0000 (15:04 +0200)]
Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8'

* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
  ppc: Add missing AltiVec cpuflag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'
Michael Niedermayer [Thu, 29 Aug 2013 12:59:58 +0000 (14:59 +0200)]
Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'

* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'
Michael Niedermayer [Thu, 29 Aug 2013 12:53:39 +0000 (14:53 +0200)]
Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'

* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cd529172377229f2e86987869ccc08f426bfe114'
Michael Niedermayer [Thu, 29 Aug 2013 12:48:42 +0000 (14:48 +0200)]
Merge commit 'cd529172377229f2e86987869ccc08f426bfe114'

* commit 'cd529172377229f2e86987869ccc08f426bfe114':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a519583991c38d38503ab08357716513facc5725'
Michael Niedermayer [Thu, 29 Aug 2013 12:38:51 +0000 (14:38 +0200)]
Merge commit 'a519583991c38d38503ab08357716513facc5725'

* commit 'a519583991c38d38503ab08357716513facc5725':
  swscale: x86: Hide arch-specific initialization details

Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
Michael Niedermayer [Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)]
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'
Michael Niedermayer [Thu, 29 Aug 2013 12:23:28 +0000 (14:23 +0200)]
Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'
Michael Niedermayer [Thu, 29 Aug 2013 12:14:32 +0000 (14:14 +0200)]
Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'

* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
  avutil: Refactor CPU extension availability macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'
Michael Niedermayer [Thu, 29 Aug 2013 12:04:29 +0000 (14:04 +0200)]
Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
  avutil: Move internal CPU detection function declarations to private header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
Michael Niedermayer [Thu, 29 Aug 2013 12:01:28 +0000 (14:01 +0200)]
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'

* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '84146963d23d76b09af633e97413cd97d9b3021e'
Michael Niedermayer [Thu, 29 Aug 2013 11:52:05 +0000 (13:52 +0200)]
Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
Michael Niedermayer [Thu, 29 Aug 2013 11:42:41 +0000 (13:42 +0200)]
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'

* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
  rtmpproto: Fix limelight authentication with abbreviated app names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime
Michael Niedermayer [Thu, 29 Aug 2013 10:59:16 +0000 (12:59 +0200)]
avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: avcodec: Consistently structure CPU extension initialization
Diego Biurrun [Tue, 20 Aug 2013 13:32:00 +0000 (15:32 +0200)]
x86: avcodec: Consistently structure CPU extension initialization

5 years agox86: avcodec: Use convenience macros to check for CPU flags
Diego Biurrun [Tue, 20 Aug 2013 12:46:58 +0000 (14:46 +0200)]
x86: avcodec: Use convenience macros to check for CPU flags

5 years agox86: Add and use more convenience macros to check CPU extension availability
Diego Biurrun [Tue, 20 Aug 2013 12:39:36 +0000 (14:39 +0200)]
x86: Add and use more convenience macros to check CPU extension availability

5 years agoMerge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'
Michael Niedermayer [Thu, 29 Aug 2013 11:02:28 +0000 (13:02 +0200)]
Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'

* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93':
  vf_fps: use double constants for default/min/max for start_time

Conflicts:
libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotruemotion2: check return value of av_malloc(z)
Paul B Mahol [Wed, 28 Aug 2013 16:48:15 +0000 (16:48 +0000)]
truemotion2: check return value of av_malloc(z)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoppc: cosmetics: Consistently format CPU flag detection invocations
Diego Biurrun [Fri, 23 Aug 2013 16:50:53 +0000 (18:50 +0200)]
ppc: cosmetics: Consistently format CPU flag detection invocations

5 years agocosmetics: Place arch initialization calls in alphabetical order
Diego Biurrun [Tue, 20 Aug 2013 16:24:27 +0000 (18:24 +0200)]
cosmetics: Place arch initialization calls in alphabetical order

5 years agoarm: fmtconvert: Split armv6 fmtconvert code off from vfp code
Diego Biurrun [Fri, 23 Aug 2013 18:01:36 +0000 (20:01 +0200)]
arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

5 years agoarm: float_dsp: Propagate cpu_flags to vfp initialization function
Diego Biurrun [Fri, 23 Aug 2013 17:39:21 +0000 (19:39 +0200)]
arm: float_dsp: Propagate cpu_flags to vfp initialization function

5 years agoarm: dcadsp: Move synth filter initialization to dcadsp file
Diego Biurrun [Fri, 23 Aug 2013 16:15:32 +0000 (18:15 +0200)]
arm: dcadsp: Move synth filter initialization to dcadsp file

5 years agoswscale: cosmetics: Drop silly camelCase from swScale function pointer name
Diego Biurrun [Sun, 25 Aug 2013 15:30:05 +0000 (17:30 +0200)]
swscale: cosmetics: Drop silly camelCase from swScale function pointer name

5 years agoswscale: Add some missing av_cold to arch-specific init functions
Diego Biurrun [Tue, 20 Aug 2013 08:52:54 +0000 (10:52 +0200)]
swscale: Add some missing av_cold to arch-specific init functions

5 years agoswscale: consistent names for arch-specific acceleration functions
Diego Biurrun [Tue, 20 Aug 2013 08:48:40 +0000 (10:48 +0200)]
swscale: consistent names for arch-specific acceleration functions

5 years agoswscale: ppc: Hide arch-specific initialization details
Diego Biurrun [Wed, 10 Oct 2012 23:06:04 +0000 (01:06 +0200)]
swscale: ppc: Hide arch-specific initialization details

Also give consistent names to init functions.

5 years agolavf/ftp: fix possible crash
Lukasz Marek [Wed, 28 Aug 2013 23:54:04 +0000 (01:54 +0200)]
lavf/ftp: fix possible crash

5 years agoavformat/utils: fix av_probe_input_buffer2() so it returns the probe score
Michael Niedermayer [Wed, 28 Aug 2013 23:07:57 +0000 (01:07 +0200)]
avformat/utils: fix av_probe_input_buffer2() so it returns the probe score

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: Add missing AltiVec cpuflag detection invocations
Diego Biurrun [Fri, 23 Aug 2013 16:48:17 +0000 (18:48 +0200)]
ppc: Add missing AltiVec cpuflag detection invocations

5 years agodoc/APIchanges: add missing entry for av_format_probe_score() function addition
Stefano Sabatini [Wed, 28 Aug 2013 22:10:34 +0000 (00:10 +0200)]
doc/APIchanges: add missing entry for av_format_probe_score() function addition

5 years agodoc/formats: remove probe_score entry, since it's not an option
Stefano Sabatini [Wed, 28 Aug 2013 22:08:27 +0000 (00:08 +0200)]
doc/formats: remove probe_score entry, since it's not an option

5 years agoppc: fdct: Remove vim editor settings comment
Diego Biurrun [Fri, 23 Aug 2013 16:46:49 +0000 (18:46 +0200)]
ppc: fdct: Remove vim editor settings comment

5 years agompegvideo: Replace arch initialization ifdeffery by standard conditionals
Diego Biurrun [Tue, 20 Aug 2013 16:25:04 +0000 (18:25 +0200)]
mpegvideo: Replace arch initialization ifdeffery by standard conditionals

5 years agox86: rv40dsp: Move inline assembly optimizations out of YASM init section
Diego Biurrun [Tue, 20 Aug 2013 13:26:02 +0000 (15:26 +0200)]
x86: rv40dsp: Move inline assembly optimizations out of YASM init section

5 years agoswscale: x86: Hide arch-specific initialization details
Diego Biurrun [Fri, 12 Oct 2012 17:54:45 +0000 (19:54 +0200)]
swscale: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

5 years agodsputil: x86: Hide arch-specific initialization details
Diego Biurrun [Fri, 12 Oct 2012 17:57:25 +0000 (19:57 +0200)]
dsputil: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

5 years agoppc: Add and use convenience macro to check for AltiVec availability
Diego Biurrun [Tue, 20 Aug 2013 14:36:47 +0000 (16:36 +0200)]
ppc: Add and use convenience macro to check for AltiVec availability

5 years agoavutil: Refactor CPU extension availability macros
Diego Biurrun [Tue, 20 Aug 2013 14:36:46 +0000 (16:36 +0200)]
avutil: Refactor CPU extension availability macros