Michael Niedermayer
da760a64d1
Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'
...
* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
hpel_template: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 20:32:27 +01:00
wm4
8b6136d3d1
vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-03-20 17:01:59 +01:00
wm4
1b1094a19d
vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame
...
This gets rid of aliasing completely unrelated structs to Picture.
Fixes the remaining compilation warnings in the vdpau code.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-03-20 17:00:39 +01:00
wm4
7948a51b5c
vdpau: don't assume Picture and H264Picture are the same
...
The code passed H264Picture* and Picture*, and assumed the
hwaccel_picture_private field was in the same place in both
structs. Somehow this happened to work in Libav, but broke in
FFmpeg (and probably subtly breaks in Libav too).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-03-20 16:59:46 +01:00
Diego Biurrun
82bb304801
dsputil: Use correct type in me_cmp_func function pointer
2014-03-20 05:03:23 -07:00
Diego Biurrun
0e083d7e43
build: Group general components separate from de/encoders in arch Makefiles
...
This is in line with how the top-level libavcodec Makefile is structured.
2014-03-20 05:03:23 -07:00
Diego Biurrun
54a6e08a65
dsputil: Conditionally compile dsputil code on all architectures
2014-03-20 05:03:23 -07:00
Diego Biurrun
5169e68895
dsputil: Propagate bit depth information to all (sub)init functions
...
This avoids recalculating the value over and over again.
2014-03-20 05:03:23 -07:00
Diego Biurrun
cf7a216757
arm: dsputil: K&R formatting cosmetics
2014-03-20 05:03:23 -07:00
Diego Biurrun
1675975216
ppc: dsputil: Drop trailing semicolon from macros
...
This allows for a more natural macro usage.
2014-03-20 05:03:22 -07:00
Diego Biurrun
b7d24fd4b2
ppc: dsputil: Merge some declarations and initializations
2014-03-20 05:03:22 -07:00
Diego Biurrun
b045283f21
ppc: dsputil: Simplify some ifdeffed function definitions
2014-03-20 05:03:22 -07:00
Diego Biurrun
8bd6f88266
ppc: dsputil: Drop some unnecessary parentheses
2014-03-20 05:03:22 -07:00
Diego Biurrun
022184a646
ppc: dsputil: more K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
30f3f95987
ppc: dsputil: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
82ee14d2ce
ppc: dsputil: comment formatting and wording/grammar improvements
2014-03-20 05:03:22 -07:00
Diego Biurrun
cce791b17b
hpeldsp_template: Merge some declarations and initializations
2014-03-20 05:03:22 -07:00
Diego Biurrun
2539cf1c81
hpeldsp_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Diego Biurrun
2972087e39
hpel_template: Drop some unnecessary parentheses
2014-03-20 05:03:22 -07:00
Diego Biurrun
e8eace3276
hpel_template: K&R formatting cosmetics
2014-03-20 05:03:22 -07:00
Ben Avison
e555e1bc39
truehd: tune VLC decoding for ARM.
...
Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant)
6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5%
8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5%
8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6%
6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6%
6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1%
8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4%
8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 22:24:32 +01:00
Michael Niedermayer
dde16f5aae
avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1
...
Fixes Ticket3229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
493296800c
avcodec/mjpegdec: parse avid data from extradata
...
Makes no difference for any file tested but is needed
for following bug-fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
046a75eea0
avcodec/mjpeg: print info from parse_avid() if requested
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
98f9aa389b
avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID
...
0 should have been the default, this change should make no difference
but this is needed for the following bugfix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Michael Niedermayer
1083c479eb
avcodec/mjpegdec: factorize parse_avid out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 18:16:42 +01:00
Carl Eugen Hoyos
57fdc74c34
Add one forgotten named inline asm operand in libavcodec/x86/motion_est.c.
2014-03-19 03:00:19 +01:00
Michael Niedermayer
1d8e97c79c
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
...
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See: 36397ea1c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 01:32:05 +01:00
Michael Niedermayer
543a46e0d1
Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'
...
* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
libopenjpeg: K&R formatting cosmetics
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19 01:06:29 +01:00
Matt Oliver
8236747511
Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.
...
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 23:39:30 +01:00
Matt Oliver
b2d3a45598
avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported
...
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 23:37:50 +01:00
Carl Eugen Hoyos
8f45bd1433
libopenjpeg: Support rgba64 encoding
2014-03-18 21:54:31 +01:00
Vittorio Giovara
1b51b7ba00
libopenjpeg: Support rgba64 decoding
2014-03-18 21:54:31 +01:00
Vittorio Giovara
1ea9fa15c3
libopenjpeg: K&R formatting cosmetics
2014-03-18 21:54:25 +01:00
Michael Niedermayer
05d7059ac6
avcodec/h264pred_template: fix declarations after statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 20:53:37 +01:00
Yogender Kumar Gupta
6f7ca1f55b
avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction
...
This is limited to the case where x264_build = -1, to not break x264 decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 20:37:26 +01:00
Michael Niedermayer
61ad2b42a1
Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'
...
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 19:59:00 +01:00
Michael Niedermayer
c56d25c476
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 14:08:40 +01:00
Janne Grunau
d961a79eb0
sbrdsp: move #if to disable all educational code
...
Avoids a warning of the unused function 'autocorrelate'.
2014-03-18 13:08:00 +01:00
Janne Grunau
c829b35c08
lavc: er: remove unused variable size
...
The code using it was removed in d66e305bd1
.
2014-03-18 13:07:52 +01:00
Vittorio Giovara
3795ec6858
svq3: directly set pix_fmt and color_range
2014-03-18 08:21:29 +01:00
Michael Niedermayer
8ab8070784
avcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2()
...
This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 02:03:30 +01:00
James Almer
aa1f38015c
x86/synth_filter: improve FMA version
...
Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 21:04:15 +01:00
Michael Niedermayer
34e325efa5
Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'
...
* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 16:23:01 +01:00
Michael Niedermayer
987b873049
Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd'
...
* commit '2183432e6dc8aedf1ef3db63006a2a8195479abd':
mdec: set color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 16:14:28 +01:00
Michael Niedermayer
ca0e6fa731
Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'
...
* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
fraps: set color_range
Conflicts:
libavcodec/fraps.c
See: 79f452f4e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:58:02 +01:00
Michael Niedermayer
3731c40989
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
...
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
png: Support rgb48 and rgba64 encoding
Conflicts:
libavcodec/pngenc.c
See: f94ce3bcab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:33:17 +01:00
Michael Niedermayer
a00d4c5956
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
...
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:29:42 +01:00
Michael Niedermayer
b361a0bf1f
Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'
...
* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
codec_desc: update dvaudio tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 14:53:05 +01:00
Michael Niedermayer
ad9a6e19e1
Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'
...
* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:46:23 +01:00
Michael Niedermayer
3e3b0b3a40
avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:35:23 +01:00
Michael Niedermayer
dc226c023d
Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'
...
* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
mpegvideo: remove h264-only fields
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:31:28 +01:00
Michael Niedermayer
329a3286d6
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
...
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:23:48 +01:00
Michael Niedermayer
29be9b5301
avcodec/dxva2: fix pointers after H264Picture
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:22:40 +01:00
Michael Niedermayer
2a37e560dc
avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 13:05:13 +01:00
Michael Niedermayer
377cfc28a2
avcodec/vaapi: fix pointer types after H264Picture changes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 12:45:36 +01:00
Michael Niedermayer
9517900bef
Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'
...
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 12:36:48 +01:00
Michael Niedermayer
3e5833802e
Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'
...
* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
h264: Remove MotionEstContext and move the relevant fields to H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 12:26:09 +01:00
Michael Niedermayer
bb3c0571d3
Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'
...
* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
h264: Replace mpegvideo-specific MAX_THREADS by private define
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 06:17:29 +01:00
Michael Niedermayer
a81a2b514e
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
...
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 06:05:19 +01:00
Michael Niedermayer
6102dda1d7
avcodec/h264: h264_set_erpic() clear destination
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:52:05 +01:00
Michael Niedermayer
c237e88d51
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
...
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
h264: move relevant fields from Picture to H264Picture
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:51:27 +01:00
Michael Niedermayer
4f22e39e65
avcodec/error_resilience: fix the case when MVs are not available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:36:17 +01:00
Michael Niedermayer
8ef9dcf1d7
avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination
...
Fixes crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:13:59 +01:00
Michael Niedermayer
533bc4c0a3
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
...
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
er: move relevant fields from Picture to ERPicture
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 05:08:46 +01:00
Michael Niedermayer
3dab9e804a
Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'
...
* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e':
h264: directly use frames in ff_h264_draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 04:41:36 +01:00
Michael Niedermayer
3ddf9b5b77
Merge commit '75af13a'
...
* commit '75af13a':
mpegvideo: directly use frames in ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 04:35:48 +01:00
Matt Oliver
b73aae6fe9
avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 04:19:59 +01:00
Michael Niedermayer
8e92ff2546
avcodec/h264: be more tolerant on what pixel format changes trigger reinits
...
Fixes Ticket3260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 02:37:29 +01:00
Matt Oliver
9eb3f11c55
Add missing external declarations.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 00:48:09 +01:00
Matt Oliver
590805b7c3
Fixed 64bit conformance with mvzbl.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 00:13:50 +01:00
Vittorio Giovara
75177b2f5e
libx264: check color_range
2014-03-16 23:31:30 +01:00
Vittorio Giovara
bf0d7da7cb
ljpeg: check color_range
2014-03-16 23:31:30 +01:00
Vittorio Giovara
2183432e6d
mdec: set color_range
2014-03-16 23:31:30 +01:00
Vittorio Giovara
6612a03d74
fraps: set color_range
2014-03-16 23:31:30 +01:00
Vittorio Giovara
1c1fbc70ca
mjpeg: set color_range
2014-03-16 23:31:30 +01:00
Carl Eugen Hoyos
5b1b91cfb8
tiff: Support rgba encoding
2014-03-16 23:31:29 +01:00
Carl Eugen Hoyos
cccac7654f
png: Support rgb48 and rgba64 encoding
2014-03-16 23:29:51 +01:00
Carl Eugen Hoyos
58c215961a
raw, nut: Support rgba64 encoding
2014-03-16 23:29:51 +01:00
Vittorio Giovara
c598b569fb
png: K&R formatting cosmetics
2014-03-16 23:29:50 +01:00
Vittorio Giovara
f7518f1a0e
codec_desc: update dvaudio tag
2014-03-16 23:05:48 +01:00
Vittorio Giovara
d24e9a99a4
h264 does not depend on mpegvideo any more
2014-03-16 23:05:47 +01:00
Vittorio Giovara
7245a0ae87
mpegvideo: remove h264-only fields
2014-03-16 23:05:47 +01:00
Vittorio Giovara
be039278b5
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
...
Drop the mpegvideo dependency for svq3 in configure.
2014-03-16 23:05:39 +01:00
Vittorio Giovara
e0c16e4e32
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
2014-03-16 23:04:41 +01:00
Vittorio Giovara
136034d86b
h264: Remove MotionEstContext and move the relevant fields to H264Context
...
Unused buffers scratchpad and temp have been dropped too.
2014-03-16 23:01:01 +01:00
Vittorio Giovara
e3c2d0f3d4
h264: Replace mpegvideo-specific MAX_THREADS by private define
2014-03-16 23:01:01 +01:00
Vittorio Giovara
5d1c2e53ab
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
2014-03-16 23:01:01 +01:00
Vittorio Giovara
9b749c8274
h264: move relevant fields from Picture to H264Picture
2014-03-16 23:01:00 +01:00
Vittorio Giovara
d66e305bd1
er: move relevant fields from Picture to ERPicture
...
This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().
2014-03-16 23:01:00 +01:00
Vittorio Giovara
1c79b1625d
h264: directly use frames in ff_h264_draw_horiz_band()
2014-03-16 23:01:00 +01:00
Vittorio Giovara
75af13a0e4
mpegvideo: directly use frames in ff_draw_horiz_band()
2014-03-16 23:01:00 +01:00
Peter Ross
97bb0076c5
avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where bits_per_coded_sample < 16
...
The bit packing method is communicted via codec_tag:
BIT[0] big-endian packing
BIT[16] 16-bit little endian packing
BIT[32] 32-bit little-endian packing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 18:24:23 +01:00
Michael Niedermayer
06a3185e38
avcodec/mpegvideo_enc: dont use direct mode for unaligned input
...
Fixes Ticket3456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 14:56:42 +01:00
Michael Niedermayer
da89572004
avcodec: Move STRIDE_ALIGN to internal.h
...
The next commit/bugfix will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 14:56:42 +01:00
Peter Ross
d1bb17940d
avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary
...
Fixes ticket #3461 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:34:42 +01:00
Michael Niedermayer
41d08ca575
avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:08:45 +01:00
Michael Niedermayer
2b8d28439b
avcodec/h264_cabac: move the arm unchecked_bitstream reader special case closer to where the issue is
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:02:31 +01:00
Michael Niedermayer
669235e0b3
avcodec/h264_cabac: disable the unchecked bitstream reader for arm & aarch64
...
The newly added optimizations do not work with the unchecked reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 00:58:48 +01:00
Michael Niedermayer
a8a84fa8b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
codec_desc: group image codecs together
Conflicts:
libavcodec/codec_desc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:36:46 +01:00