49bf712a89
libavcodec/wmalosslessdec: add missing emms
...
prevent failure with mmx2
should fix fate failure on freebsd mmx2 client
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 23:45:20 +02:00
476bd3c7e4
x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm
...
It's still a dsputil function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 22:11:18 +02:00
d7463c6813
Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'
...
* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
dsputil: Split off global motion compensation bits into a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 21:10:10 +02:00
32cf26cc6a
Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'
...
* commit 'f23d26a6864128001b03876b0b92fffe131f2060':
h264: avoid using uninitialized memory in NEON chroma mc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 20:35:33 +02:00
fab9df63a3
dsputil: Split off global motion compensation bits into a separate context
2014-06-23 09:58:17 -07:00
f23d26a686
h264: avoid using uninitialized memory in NEON chroma mc
...
Adapt commit 982b596ea6
2014-06-23 16:32:15 +02:00
b222e0773c
Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'
...
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
indeo45: use is_indeo4 context flag instead of checking codec ID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 13:56:52 +02:00
35bb74900b
Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'
...
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
dsputil: Split bswap*_buf() off into a separate context
Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 13:31:26 +02:00
e121ac634b
indeo45: use is_indeo4 context flag instead of checking codec ID
...
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-23 09:29:39 +02:00
56afbe8dbc
Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'
...
* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
mpeg: Split error resilience bits off into a separate file
Conflicts:
configure
libavcodec/Makefile
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 03:48:30 +02:00
ca350378de
Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'
...
* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
Check mp3 header before calling avpriv_mpegaudio_decode_header().
Conflicts:
libavformat/mp3enc.c
See: 2dd0da787c
2014-06-23 03:34:13 +02:00
2bcf34a0ef
Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'
...
* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
Check if an mp3 header is using a reserved sample rate.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 03:25:04 +02:00
c67b449beb
dsputil: Split bswap*_buf() off into a separate context
2014-06-22 18:22:31 -07:00
7b9ef8d701
mpeg: Split error resilience bits off into a separate file
2014-06-22 17:36:37 -07:00
f2f2e7627f
Check mp3 header before calling avpriv_mpegaudio_decode_header().
...
As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.
CC:libav-stable@libav.org
2014-06-22 20:31:58 -04:00
44127546b0
Check if an mp3 header is using a reserved sample rate.
...
Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.
Bug-Id: 705
CC:libav-stable@libav.org
2014-06-22 20:31:57 -04:00
c172683bf4
x86/dsputil: remove redundant global motion compensation code
...
The SSE version has been no different than the mmx one since commit a41bf09d
2014-06-23 02:15:06 +02:00
42e6fc147b
avcodec/apedec: optimize sign combination
...
48078630 -> 32533850 dezi cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 02:15:06 +02:00
49f1b869b6
Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'
...
* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
libx264: Correctly manage constant rate factor params
Conflicts:
libavcodec/libx264.c
See: 3a1c8951bc
2014-06-23 01:21:39 +02:00
efec730431
Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'
...
* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
ape: Replace memset(0) by zero initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 01:03:30 +02:00
412015694c
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
...
* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:57:47 +02:00
9d91fae8a1
Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
...
* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
build: Have the eatqi decoder depend on the MPEG-1 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:39:53 +02:00
738272826f
Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
...
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:19:41 +02:00
ca2f59e121
avcodec/dvbsubdec: support returning exact end times
...
fixess part of ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22 21:06:49 +02:00
0ef256d515
libx264: Correctly manage constant rate factor params
...
By default they are set to -1.
2014-06-22 21:01:07 +02:00
6ec3dc97fc
x86/audiodsp: move asm code out of dsputil
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22 19:53:09 +02:00
f83896abda
ape: Replace memset(0) by zero initialization
2014-06-22 18:43:11 +02:00
99497b4683
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
...
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22 17:58:28 +02:00
8d695dc411
mpeg: Mark ff_mpeg_set_erpic() static
...
It is not used outside of the file.
2014-06-22 06:28:46 -07:00
c54e118722
build: Have the eatqi decoder depend on the MPEG-1 decoder
...
eatqi uses more than just the shared mpegvideo bits.
2014-06-22 06:28:46 -07:00
03391b5432
build: Add missing object files for Matroska demuxer
2014-06-22 06:28:46 -07:00
9a9e2f1c8a
dsputil: Split audio operations off into a separate context
2014-06-22 06:20:15 -07:00
5ab51f7535
avcodec/libtwolame: fix encoding lsf with defaults
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21 17:05:09 +02:00
a2de7b1bd5
avcodec/bitstream: document the double volatile
...
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21 14:55:32 +02:00
1caedf629a
avcodec/ituh263enc: fix advanced intra coding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21 04:05:28 +02:00
4667116c39
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
...
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 23:18:45 +02:00
fe43facd65
avcodec/utils: check sar only when width/height are set
...
This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 23:02:52 +02:00
0dceefc5fa
Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
...
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 22:20:28 +02:00
329898aa45
avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2
...
gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 21:54:23 +02:00
33f83a2157
avcodec/x86/rv40dsp_init: fix () in macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 21:36:43 +02:00
40cbad9ff7
avcodec/wavpackenc: fix () in macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 21:36:17 +02:00
ca1e36a8e4
h264: fix build when error resilience is disabled
2014-06-20 12:48:06 -04:00
0a995311ce
Merge commit 'd349afb07bacccb62eb5369c38d6406d2909d792'
...
* commit 'd349afb07bacccb62eb5369c38d6406d2909d792':
dv: cosmetics, reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 18:10:33 +02:00
b0fdc76600
Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'
...
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 18:00:42 +02:00
c2b1225c16
Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'
...
* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
dvenc: initialize the profile only once, at init
Conflicts:
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 17:15:39 +02:00
4a99333581
Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
...
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 16:40:04 +02:00
9e500efdbe
Add av_image_check_sar() and use it to validate SAR
2014-06-20 10:39:33 -04:00
d349afb07b
dv: cosmetics, reindent
2014-06-20 14:15:39 +02:00
650dee63c8
dv: get rid of global non-const tables
...
Instead, store them in the context and compute on each parameter change.
2014-06-20 14:15:31 +02:00
778111592b
dvenc: initialize the profile only once, at init
...
We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.
2014-06-20 14:15:16 +02:00
Michael Niedermayer
James Almer
Diego Biurrun
Janne Grunau
Dirk Ausserhaus
Justin Ruggles
Anshul Maheshwari
Luca Barbato
Vittorio Giovara
Anton Khirnov