Michael Niedermayer
09c94b57ca
Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'
...
* commit 'a6b650118543e1580e872896d8976042b7c32d01':
ppc: cosmetics: Consistently format CPU flag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30 11:48:54 +02:00
Timothy Gu
e45e72f5f8
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>
2013-08-30 11:37:07 +02:00
Timothy Gu
40b8350b57
doc/encoders: reformat libmp3lame doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-30 11:36:35 +02:00
Michael Niedermayer
547d690d67
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>
2013-08-30 05:27:51 +02:00
Michael Niedermayer
20b965a1a4
avcodec/ffv1dec: check global header version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30 03:43:49 +02:00
Michael Niedermayer
259292f9d4
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>
2013-08-30 01:45:11 +02:00
Michael Niedermayer
24b4e6c373
snow: Check av_frame_alloc() failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 23:23:22 +02:00
Michael Niedermayer
c4224fff1b
avcodec/snow: gray support
...
Fixes Ticket839
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 22:52:04 +02:00
Michael Niedermayer
ec120efaa9
doc/snow: add gray/alpha/gbr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 22:52:04 +02:00
Michael Niedermayer
811d58e083
avcodec/utils: support non edge emu for grayscale
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 22:52:04 +02:00
Michael Niedermayer
cf06dee58d
libavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 19:46:52 +02:00
Michael Niedermayer
1cefdc397e
avcodec/snowenc: remove now unneeded include <assert.h>
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 17:08:56 +02:00
Michael Niedermayer
2bc8348c85
avcodec/snowenc: convert all asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 17:08:56 +02:00
Michael Niedermayer
f07b569939
snowenc: remove disabled QUANTIZE2 code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 17:08:56 +02:00
Michael Niedermayer
f896f92337
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cosmetics: Place arch initialization calls in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 16:15:54 +02:00
Michael Niedermayer
e1c3e6277f
Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'
...
* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
arm: fmtconvert: Split armv6 fmtconvert code off from vfp code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 16:10:39 +02:00
Michael Niedermayer
946f080b54
Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'
...
* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
arm: float_dsp: Propagate cpu_flags to vfp initialization function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 16:05:04 +02:00
Michael Niedermayer
99e7c702db
Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'
...
* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
arm: dcadsp: Move synth filter initialization to dcadsp file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 16:00:45 +02:00
Michael Niedermayer
01cac26f68
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>
2013-08-29 15:56:03 +02:00
Michael Niedermayer
c49b6c3d99
Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf'
...
* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
swscale: Add some missing av_cold to arch-specific init functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:48:53 +02:00
Michael Niedermayer
c5cec9a42b
Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'
...
* commit '3aa682f25324d811ec284edc808eb71a46eae950':
swscale: consistent names for arch-specific acceleration functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:41:05 +02:00
Michael Niedermayer
5ff1b588eb
Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
...
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
swscale: ppc: Hide arch-specific initialization details
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:10:09 +02:00
Michael Niedermayer
4399e72723
Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8'
...
* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
ppc: Add missing AltiVec cpuflag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:04:59 +02:00
Michael Niedermayer
3e75f98667
Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'
...
* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
ppc: fdct: Remove vim editor settings comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:00:02 +02:00
Michael Niedermayer
8251529ff3
Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'
...
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
mpegvideo: Replace arch initialization ifdeffery by standard conditionals
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:53:44 +02:00
Michael Niedermayer
37494bdb0d
Merge commit 'cd529172377229f2e86987869ccc08f426bfe114'
...
* commit 'cd529172377229f2e86987869ccc08f426bfe114':
x86: rv40dsp: Move inline assembly optimizations out of YASM init section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:48:46 +02:00
Michael Niedermayer
db6b389c7f
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>
2013-08-29 14:42:34 +02:00
Michael Niedermayer
477641e9f8
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
...
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
dsputil: x86: Hide arch-specific initialization details
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:32:05 +02:00
Michael Niedermayer
29daad5b98
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>
2013-08-29 14:24:07 +02:00
Michael Niedermayer
2a60666d1d
Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'
...
* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
avutil: Refactor CPU extension availability macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:15:10 +02:00
Michael Niedermayer
c83d794936
Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'
...
* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
avutil: Move internal CPU detection function declarations to private header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:05:15 +02:00
Michael Niedermayer
18a9deedb0
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
...
* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
apedec: do not buffer decoded samples over AVPackets
Conflicts:
libavcodec/apedec.c
See: 77d89a5b16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 14:02:33 +02:00
Michael Niedermayer
8f68ef4681
Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'
...
* commit '84146963d23d76b09af633e97413cd97d9b3021e':
configure: x86: Fix handling of i686 and cpunop features
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 13:52:09 +02:00
Michael Niedermayer
5f9b1aae50
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
...
* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
rtmpproto: Fix limelight authentication with abbreviated app names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 13:43:07 +02:00
Michael Niedermayer
8b79a458c0
avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 13:12:09 +02:00
Michael Niedermayer
88262e1c1d
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>
2013-08-29 13:02:28 +02:00
Paul B Mahol
d49f2603be
truemotion2: check return value of av_malloc(z)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-29 10:46:42 +00:00
Diego Biurrun
a6b6501185
ppc: cosmetics: Consistently format CPU flag detection invocations
2013-08-29 11:31:32 +02:00
Diego Biurrun
67e6a9f558
cosmetics: Place arch initialization calls in alphabetical order
2013-08-29 11:24:14 +02:00
Diego Biurrun
f0389eb777
arm: fmtconvert: Split armv6 fmtconvert code off from vfp code
2013-08-29 11:24:14 +02:00
Diego Biurrun
7ffda66fd5
arm: float_dsp: Propagate cpu_flags to vfp initialization function
2013-08-29 11:24:14 +02:00
Diego Biurrun
bd549cbaac
arm: dcadsp: Move synth filter initialization to dcadsp file
2013-08-29 11:24:14 +02:00
Diego Biurrun
1909f6b1b6
swscale: cosmetics: Drop silly camelCase from swScale function pointer name
2013-08-29 10:23:54 +02:00
Diego Biurrun
4e0799a4d0
swscale: Add some missing av_cold to arch-specific init functions
2013-08-29 10:23:53 +02:00
Diego Biurrun
3aa682f253
swscale: consistent names for arch-specific acceleration functions
2013-08-29 10:23:52 +02:00
Diego Biurrun
c2503d9c8a
swscale: ppc: Hide arch-specific initialization details
...
Also give consistent names to init functions.
2013-08-29 10:23:41 +02:00
Lukasz Marek
f3ace37a3b
lavf/ftp: fix possible crash
2013-08-29 01:57:38 +02:00
Michael Niedermayer
c4810fbe4f
avformat/utils: fix av_probe_input_buffer2() so it returns the probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 01:15:15 +02:00
Diego Biurrun
6af2c351b3
ppc: Add missing AltiVec cpuflag detection invocations
2013-08-29 00:24:46 +02:00
Stefano Sabatini
7528fdcda3
doc/APIchanges: add missing entry for av_format_probe_score() function addition
2013-08-29 00:10:34 +02:00