Michael Niedermayer
61c2cec957
pthreads: fix segfault due to the thread beimg killed before it has been allocated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 17:55:01 +01:00
kaptnole
cb8db6423a
aacdec: Fix Sound fragments after seeking
...
Fixes Ticket420
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 14:37:39 +01:00
Mans Rullgard
b7581b5c83
cook: use a table for xor key rotation
...
This is simpler and avoids an invalid shift by 32 in the
aligned case.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
644bff6c9b
apedec: fix signed integer overflows
...
This bit manipulation is equivalent but avoids undefined
shifts and overflows.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
93c286e54f
qtrle: simplify 32-bit decode using intreadwrite macros
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
3bd1162a52
gif: fix invalid signed shifts
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:40 +00:00
Reimar Döffinger
7fb55e0b02
rtjpeg: simplify get_block() by using get_bits_left.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:40:51 +01:00
Reimar Döffinger
7a62ddb689
rtjpeg: check get_block return value for error.
...
This avoids crashes due to reading out-of-bounds.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:39:58 +01:00
Reimar Döffinger
f6afacdb3b
nuv: check per-frame header for validity.
...
Since it contains dimensions parsing an invalid one has rather
annoying effects.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:38:59 +01:00
Reimar Döffinger
785baa738a
nuv: use FFALIGN.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:38:14 +01:00
Carl Eugen Hoyos
1484b5dec5
flicvideo: check extradata_size before accessing extradata.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:36:16 +01:00
Michael Niedermayer
5ace144fe0
fraps: check for overread.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:35:57 +01:00
K.Y.H
51f316a997
cook: fix apparent typo in extradata parsing
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:33:31 +01:00
Anton Khirnov
488eec1044
lavc: update doxy to use nondeprecated API.
2011-11-26 08:26:24 +01:00
Michael Niedermayer
022f8d27dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
Michael Niedermayer
fc75e6f168
vc1dec: fix scantable for advanced P frames
...
Fixes: vc1 file from Ticket606
Fixes: vc1+vc1+++artifacts*.vc1
Fixes: mpeg+vc1+++salxxos.evo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 23:44:39 +01:00
Michael Niedermayer
a3b3562b47
vc1dec: fix 10l typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 22:46:17 +01:00
Michael Niedermayer
9e794d103c
vc1dec: drop damaged B frames
...
Fixes: vc1_error_spilt.avi of Ticket606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 20:55:25 +01:00
Michael Niedermayer
7d52f46db7
vc1dec: fix used ER flags in vc1_decode_b_blocks()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 20:54:57 +01:00
Michael Niedermayer
1afe49b062
indeo3: out of array read checks for decode_plane()
...
Fixes: avi+indeo3+++1-dog.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 18:04:17 +01:00
Michael Niedermayer
e9e642cbfb
indeo3: Check remaining bits in parse_bintree()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 17:55:23 +01:00
Anatoly Nenashev
a7cfef2994
H264: Check if more RBSP data in PPS provided by current profile due to Annex A.
...
This patch also fix issue https://ffmpeg.org/trac/ffmpeg/ticket/685 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 17:10:47 +01:00
Mans Rullgard
cc276c85d1
Make channel layout masks unsigned
...
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-25 13:19:54 +00:00
Mans Rullgard
00a856e3f9
dca: ARMv6 optimised decode_blockcode()
...
This is a hand-tuned version of the code with impossible parts of
the FASTDIV function ommitted.
2-5% faster overall on Cortex-A8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-25 13:19:53 +00:00
Janne Grunau
117e2a30f2
frame-mt: return consumed packet size in ff_thread_decode_frame
...
This is required to fulfill avcodec_decode_video2() promise to return
the number of consumed bytes on success.
2011-11-25 08:25:12 +01:00
Michael Niedermayer
92afb43162
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
snow: split snow in snowdec and snowenc
tiffenc: deprecate using compression_level
swscale: fix failing fate tests.
swscale: add support for planar RGB input.
h264: add support for decoding planar RGB images.
Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
pixfmt: add planar RGB formats.
Conflicts:
libavcodec/h264.c
libavcodec/snow.c
libavcodec/utils.c
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 04:34:44 +01:00
Michael Niedermayer
e421b79d01
indeo3: fix null pointer dereference in vulnerable.mov
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 22:39:23 +01:00
Alex Zhukov
eb511ef636
yuv pixel formats support in openjpeg decoder + 10bit support
...
Signed-off-by: Alex Zhukov <zhukov.alex@gmail.com>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 21:51:15 +01:00
Luca Barbato
7f1b427018
snow: split snow in snowdec and snowenc
...
The common non inlined code goes in snow.c, the common inlined code in
snow.h, tables move in snowdata.h (included only by snow.c)
2011-11-24 21:35:47 +01:00
Anton Khirnov
8b7412fe4e
tiffenc: deprecate using compression_level
2011-11-24 21:31:36 +01:00
Ronald S. Bultje
db431f7efe
h264: add support for decoding planar RGB images.
2011-11-24 08:25:36 -08:00
Michael Niedermayer
2bf09826c1
loco: Fix error handling.
...
Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/7120335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 15:39:41 +01:00
Sergiy Gur'yev
32ed7da135
Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 14:18:27 +01:00
Michael Niedermayer
8e576d5830
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
Justin Ruggles
c1848c4b26
pcmdec: remove unneeded resetting of samples pointer
2011-11-23 16:26:15 -05:00
Anton Khirnov
3eedd29bd7
bethsoftvideo: return proper consumed size for palette packets.
...
Also check for sufficient packet size.
2011-11-23 21:58:30 +01:00
Anton Khirnov
a94c769dad
tiffenc: add a private option for selecting compression algorithm
2011-11-23 20:29:25 +01:00
Mans Rullgard
3a0b72dee0
ARM: remove needless .text/.align directives
...
The 'function' macro already includes the appropriate
directives.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-23 15:06:50 +00:00
Michael Niedermayer
0b9a69f244
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (22 commits)
aacdec: Fix PS in ADTS.
avconv: Consistently use PIX_FMT_NONE.
dsputil: use cpuflags in x86 emu_edge_core
dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
mov: Remove some redundant and obsolete comments.
Add libavutil/mathematics.h #includes for INFINITY
doxy: structure libavformat groups
doxy: introduce an empty structure in libavcodec
doxy: provide a start page and document libavutil
doxy: cleanup pixfmt.h
regtest: split video encode/decode tests into individual targets
ARM: add explicit .arch and .fpu directives to asm.S
pthread: do not touch has_b_frames
avconv: cleanup the transcoding loop in output_packet().
avconv: split subtitle transcoding out of output_packet().
avconv: split video transcoding out of output_packet().
avconv: split audio transcoding out of output_packet().
avconv: reindent.
avconv: move streamcopy-only code out of decoding loop.
...
Conflicts:
avconv.c
libavcodec/aaccoder.c
libavcodec/pthread.c
libavcodec/version.h
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/mem.h
tests/ref/vsynth1/dv
tests/ref/vsynth1/mpeg2thread
tests/ref/vsynth2/dv
tests/ref/vsynth2/mpeg2thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 04:02:17 +01:00
Alex Converse
963f685535
aacdec: Fix PS in ADTS.
...
Fixes File1.aac and Bug 80.
2011-11-22 14:33:11 -08:00
Justin Ruggles
0e8fdd41c2
dsputil: use cpuflags in x86 emu_edge_core
...
avoids passing around the extra argument among all the macros it uses
2011-11-22 15:40:51 -05:00
Justin Ruggles
395f2e70dd
dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
...
This allows emulated_edge_mc_sse() and gmc_sse() to be used under
AV_CPU_FLAG_SSE.
2011-11-22 15:40:51 -05:00
Michael Niedermayer
b429440d85
Merge remote-tracking branch 'shariman/wmall'
...
* shariman/wmall:
call revert_cdlms()
Fix some loop conditions to prevent overreads
Initialize pred in lms_predict()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 21:32:11 +01:00
Justin Ruggles
05d1e45d1f
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
...
The initial values are not checked against the number of block sizes.
Initializing them to frame_len_bits will result in a block size index of 0
in these cases instead of something that might be out-of-range.
Fixes Bug 81.
2011-11-22 13:50:18 -05:00
Mans Rullgard
85770d6e56
Add libavutil/mathematics.h #includes for INFINITY
...
This fixes build errors in some environments.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-22 16:36:44 +00:00
Luca Barbato
e97e5a2e02
doxy: introduce an empty structure in libavcodec
2011-11-22 17:16:02 +01:00
Mans Rullgard
8ee2b4672f
ARM: add explicit .arch and .fpu directives to asm.S
...
This prevents build errors when compiler and assembler default
targets differ. Ideally each file would declare the highest
level it requires. This is however not easily possible as it
complicates assembling pre-armv6t2 code in Thumb-2 mode.
HAVE_NEON is used as indicator for ARMv7-A since no other
symbol exists for this and NEON is only available in this
variant.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-22 12:13:02 +00:00
Janne Grunau
0945eddec0
pthread: do not touch has_b_frames
...
Adding the thread count in frame level multithreading to has_b_frames
as an additional delay causes more problems than it solves.
For example inconsistent behaviour during timestamp calculation in
libavformat.
Thread count and frame level multithreading are both set by the user.
If the additional delay caused by frame level multithreading needs
to be considered in the calling code it has all information to take
it into account.
Should it become necessary to calculate a maximum delay inside
libavcodec it should be exported as its own field and not reusing
an existing field.
Based on a patch by Michael Niedermayer.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-11-22 09:50:33 +01:00
Michael Niedermayer
7876f14f8b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pthread: add some malloc failure checks
avconv: cosmetics, reformat transcode_init()
avconv: rename 'os' variable to 'oc'
doc/filters: fix some typos.
configure: add libpulse to help output
Conflicts:
avconv.c
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 02:54:50 +01:00
ami_stuff
cf14c82227
[PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder
...
Some sample IFF ACBM files can be found here:
http://aminet.net/package/dev/basic/ABdemos
Thanks to Peter Ross for his help with this patch.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 23:06:53 +01:00
Michael Niedermayer
7f6a019096
Merge remote-tracking branch 'mjbshaw/master'
...
* mjbshaw/master:
Applied patches from Michael Niedermayer to clean up the code
Added support for J2K encoding with libopenjpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 23:04:02 +01:00
Mashiat Sarker Shakkhar
ea0323b0fa
call revert_cdlms()
2011-11-22 01:03:15 +06:00
Mashiat Sarker Shakkhar
6cf31ef263
Fix some loop conditions to prevent overreads
2011-11-22 01:01:30 +06:00
Mashiat Sarker Shakkhar
a3a8d5e0c1
Initialize pred in lms_predict()
2011-11-22 00:54:01 +06:00
Clément Bœsch
2f0f9a87d0
Fix various if parenthesis misplacements.
2011-11-21 19:35:33 +01:00
Michael Niedermayer
4931c8f0f1
svq1dec: call avcodec_set_dimensions() after dimensions changed.
...
Fixes NGS00148
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 16:39:34 +01:00
Michael Niedermayer
eef5c35b43
vp3dec: Check coefficient index in vp3_dequant()
...
Fixes NGS00145
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 16:39:34 +01:00
Michael Niedermayer
895d258e9b
qdm2dec: fix buffer overflow.
...
Fixes NGS00144
Thanks to Phillip for suggestions to improve the patch.
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 16:36:49 +01:00
Justin Ruggles
a8fe9a7242
pthread: add some malloc failure checks
2011-11-21 10:18:25 -05:00
Michael Niedermayer
919c00ba5a
alsdec: update checked AV_EF flags.
...
A user who wishes to use default error concealment cannot set the
AV_EF_CRCCHECK flag because not every CRC in every format is a
reliable indicator of bitstream damage. In some formats crcrs
can be nonsensical in absence of any damage. We thus add the
AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to
allow a user to enable this reliable CRC check without having to
enable all CRC checks in all formats.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 15:51:53 +01:00
Michael Niedermayer
833a195905
h264: Fix invalid interlaced progressive MB combinations for direct mode prediction.
...
Fixes Ticket312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 02:18:47 +01:00
Michael Niedermayer
15a686b714
h263: make default color black, like flv
...
Fixes Ticket126
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20 20:40:22 +01:00
Michael Niedermayer
50d6f81956
mpegvideo: dont use ff_mspel_motion() for vc1
...
Fixes Ticket655
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20 17:19:25 +01:00
Michael Niedermayer
34465bbcb4
Merge remote-tracking branch 'shariman/wmall'
...
* shariman/wmall: (24 commits)
Clean-up
dump_int_buffer() to dump samples from a buffer
Implement revert_cdlms()
Doxy for reset_codec()
Store transient state and position of transient area
Implement use_high_update_speed() and use_normal_update_speed()
Initialize num_logged_tiles and remove unnecessary codes
Log index for each line of output
Log tile size
Output decoded residues
Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
Implement lms_update()
Implement lms_predict()
Implement reset_codec()
Add missing syntax elements to WmallDecodeCtx
Add .recent syntax element to cdlms struct
Implement clear_codec_buffers()
Add buffers to context necessary for reverting cdmls and mclms filter
Use avpriv_copy_bits() instead of ff_copy_bits()
Cosmetics
...
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20 15:43:19 +01:00
Mashiat Sarker Shakkhar
7a9807dea4
Clean-up
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3e2f664b99
dump_int_buffer() to dump samples from a buffer
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
caf9eb85b1
Implement revert_cdlms()
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
d47782df26
Doxy for reset_codec()
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3e4901b24e
Store transient state and position of transient area
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
3f3d2b5f65
Implement use_high_update_speed() and use_normal_update_speed()
2011-11-20 14:51:40 +06:00
Mashiat Sarker Shakkhar
1e0db1c52a
Initialize num_logged_tiles and remove unnecessary codes
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
5b2680a2af
Log index for each line of output
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
a7c31f1595
Log tile size
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
d5aef477e6
Output decoded residues
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
f3d349f697
Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
269a0dee19
Implement lms_update()
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
0faae518e9
Implement lms_predict()
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
03684c8ff3
Implement reset_codec()
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
93d2cabd61
Add missing syntax elements to WmallDecodeCtx
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
79b16e780d
Add .recent syntax element to cdlms struct
2011-11-20 14:51:39 +06:00
Mashiat Sarker Shakkhar
87b9c23b9a
Implement clear_codec_buffers()
2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
d58db7207d
Add buffers to context necessary for reverting cdmls and mclms filter
2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
a80a10bd73
Use avpriv_copy_bits() instead of ff_copy_bits()
2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
374582acfe
Cosmetics
2011-11-20 14:51:38 +06:00
Mashiat Sarker Shakkhar
fa3e0190f9
Add missing ff_ before the AVCodec struct for wmalossless
2011-11-20 14:51:38 +06:00
Andreas Öman
4d9d9a443f
wmall: Working bitstream parser
2011-11-20 14:51:38 +06:00
Michael Niedermayer
dbb38bc389
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Fix stack alignment for SSE
avcodec: move some AVCodecContext fields to an internal struct.
avcodec: use av_opt_set() instead of deprecated av_set_string3()
avcodec: fix some const warnings
avcodec: remove pointless AVOption, internal_buffer_count
imgutils: Fix illegal read.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-20 02:46:06 +01:00
Michael Niedermayer
c88bdafe25
lavc: translate FF_ER_EXPLODE to AV_EF_EXPLODE|COMPLIANT
...
This is most likely what the user wants.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 20:43:44 +01:00
Justin Ruggles
f3a29b750a
avcodec: move some AVCodecContext fields to an internal struct.
...
A new field, AVCodecContext.internal is used to hold a new struct
AVCodecInternal, which has private fields that are not codec-specific and are
used by general libavcodec functions.
Moved internal_buffer, internal_buffer_count, and is_copy.
2011-11-19 10:01:05 -05:00
Justin Ruggles
513b691955
avcodec: use av_opt_set() instead of deprecated av_set_string3()
2011-11-19 01:14:27 -05:00
Justin Ruggles
fa9aeb82e2
avcodec: fix some const warnings
...
libavcodec/options.c:583: warning: assignment discards qualifiers from pointer
target type
libavcodec/options.c:589: warning: initialization discards qualifiers from
pointer target type
2011-11-19 01:10:58 -05:00
Justin Ruggles
86d3730360
avcodec: remove pointless AVOption, internal_buffer_count
2011-11-19 00:36:49 -05:00
Michael Niedermayer
0af8d20755
h261dec: correct AV_EF flags.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 04:07:26 +01:00
Michael Niedermayer
b0ccebe448
mpeg12dec: correct AV_EF flags.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 04:07:26 +01:00
Michael Niedermayer
7fbe87c079
lavc: remove incorrect mapping between semantically incompatible error recognization values and flags.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 04:07:26 +01:00
Michael Niedermayer
85ab33b87f
mpegaudeiodec: correct AV_EF flags.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 04:07:26 +01:00
Michael Niedermayer
02bd11e969
lavc: Add AV_EF flags to restore support for the error_resilience framework in the new API.
...
The existing flags prior to this have a semantically different meaning and cannot be
used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 04:07:26 +01:00
Michael Niedermayer
e161b079de
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (22 commits)
configure: add check for w32threads to enable it automatically
rtmp: do not hardcode invoke numbers
cinepack: return non-generic errors
fate-lavf-ts: use -mpegts_transport_stream_id option.
Add an APIchanges entry and a minor bump for avio changes.
avio: Mark the old interrupt callback mechanism as deprecated
avplay: Set the new interrupt callback
avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
cinepak: remove redundant coordinate checks
cinepak: check strip_size
cinepak, simplify, use AV_RB24()
cinepak: simplify, use FFMIN()
cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
applehttp: Fix seeking in streams not starting at DTS=0
http: Don't use the normal http proxy mechanism for https
tls: Handle connection via a http proxy
http: Reorder two code blocks
http: Add a new protocol for opening connections via http proxies
http: Split out the non-chunked buffer reading part from http_read
segafilm: add support for raw videos
...
Conflicts:
avconv.c
configure
doc/APIchanges
libavcodec/cinepak.c
libavformat/applehttp.c
libavformat/version.h
tests/lavf-regression.sh
tests/ref/lavf/ts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 02:00:06 +01:00
Michael Bradshaw
1b987c4bb0
Applied patches from Michael Niedermayer to clean up the code
2011-11-18 15:02:44 -07:00
Joakim Plate
babf4fe01a
Don't fill in frame gaps with copied refs after flush
...
The filled in refs cause corruptions in the video frame
for a long time after it should have recovered.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-18 21:08:48 +01:00
Michael Niedermayer
14db3af4f2
qdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones()
...
This is neccessary but likely not sufficient to prevent out of array reads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-18 20:05:00 +01:00
Luca Barbato
b7d939d998
cinepack: return non-generic errors
2011-11-18 12:10:41 +01:00
Michael Niedermayer
a4009c6a9a
cinepak: remove redundant coordinate checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-18 11:58:45 +02:00
Michael Niedermayer
867b496681
cinepak: check strip_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-18 11:58:43 +02:00
Michael Niedermayer
d92fea2b14
cinepak, simplify, use AV_RB24()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-18 11:58:42 +02:00
Michael Niedermayer
a2b51fe87c
cinepak: simplify, use FFMIN()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-18 11:36:05 +02:00
Michael Niedermayer
b55aa7df6b
cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-18 11:35:56 +02:00
Michael Niedermayer
95d6e5bdd5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vp5: Fix illegal read.
vp6: Fix illegal read.
tls: Use TLSv1_client_method for OpenSSL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-18 02:55:32 +01:00
Michael Niedermayer
640424e080
j2kdec: fix 10l typo in initializing sgnd.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-18 02:35:49 +01:00
Michael Bradshaw
856b33f578
Added support for J2K encoding with libopenjpeg
...
Note: Some of the previous patches have had two bugs that have been fixed
in this patch.
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-18 01:20:40 +01:00
Clément Bœsch
3495817468
libutvideo: use K&R style.
2011-11-17 21:06:46 +01:00
Alex Converse
bb4b0ad83b
vp5: Fix illegal read.
...
Found with Address Sanitizer
2011-11-17 11:58:49 -08:00
Thierry Foucu
e0966eb140
vp6: Fix illegal read.
...
Found with Address Sanitizer
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-11-17 11:58:40 -08:00
Michael Niedermayer
5a2b3f3a52
aacdec: Avoid unneeded reinit due to ADTS headers
...
Fixes Ticket 662
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 18:11:41 +01:00
Michael Bradshaw
31ec694771
libopenjpeg: rename decoder source file.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 16:28:37 +01:00
Michael Niedermayer
3e971fc6b5
h264: fix cur_chroma_format_idc with slice multithreading.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 05:42:18 +01:00
Michael Niedermayer
8709ba907a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegaudiodec: Don't use a nonexistent log context for av_dlog
avformat: Accept the ISO8601 separate format as input, too
avformat: Interpret times in ff_iso8601_to_unix_time as UTC
avutil: Add av_timegm as a public function
cinepak: Add another special case so that it can handle the following file:
lagarith: add some RGBA decoding support
lagarith: Add correct line prediction for RGB
Conflicts:
doc/APIchanges
libavcodec/cinepak.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 02:44:33 +01:00
Michael Niedermayer
4f7ad4c3e4
h264: migrate poc gap based has_b_frames calculation into new has_b_frame calculation code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 01:08:17 +01:00
Michael Niedermayer
ed83f84891
h264: minor simplification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 00:36:38 +01:00
Michael Niedermayer
bfca35114a
h264: rewrite has_b_frame calculation code,
...
the previous implementation was too buggy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 00:01:40 +01:00
Michael Niedermayer
18b7f40007
h264: reset last_pocs on IDRs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 23:57:17 +01:00
Michael Niedermayer
7056f13a89
cinepak: remove redundant coordinate checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 20:47:05 +01:00
Michael Niedermayer
cea0c82d9b
cinepak: check strip_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 20:47:05 +01:00
Michael Niedermayer
f35f50b311
cinepak, simplify, use AV_RB24()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 20:46:59 +01:00
Michael Niedermayer
111ffa55b7
cinepak: simplify, use FFMIN()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 20:45:11 +01:00
Michael Niedermayer
4e7b3ef3b3
cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 15:19:57 +01:00
Mike Melanson
12d9a36481
Add another special case to the Cinepak video decoder so that it can handle the following file:
...
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov
This fix works around another work around which handles a different type
of odd Cinepak data.
Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 15:13:01 +01:00
Martin Storsjö
268fb3f985
mpegaudiodec: Don't use a nonexistent log context for av_dlog
...
This fixes builds with DEBUG defined, broken since
1158745a2d
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-16 12:01:32 +02:00
Mike Melanson
747283a078
cinepak: Add another special case so that it can handle the following file:
...
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov
This fix works around another work around which handles a different type
of odd Cinepak data.
Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-16 10:50:52 +02:00
Kostya Shishkov
ffc638c283
lagarith: add some RGBA decoding support
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-16 10:49:51 +02:00
Nathan Caldwell
39616fc307
lagarith: Add correct line prediction for RGB
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-16 10:46:30 +02:00
Clément Bœsch
4da45aff28
cleanup: remove various double end ';' all over the code.
2011-11-16 07:48:23 +01:00
Michael Niedermayer
20431a9982
wma: Check channel number before init.
...
Fixes Ticket240
Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 03:37:44 +01:00
Michael Niedermayer
c1c836d9eb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: fix multiplication overflow in avformat_find_stream_info()
cosmetics: indentation
mpegaudiodec: init static tables in AVCodec.init_static_data()
Conflicts:
libavcodec/mpegaudiodec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 02:27:31 +01:00
Michael Niedermayer
7776091b9f
diracdec: obmc accesses arent aligned for all files.
...
Thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 23:37:40 +01:00
Justin Ruggles
f1d1516e55
cosmetics: indentation
2011-11-15 12:17:20 -05:00
Justin Ruggles
1158745a2d
mpegaudiodec: init static tables in AVCodec.init_static_data()
2011-11-15 12:17:20 -05:00
Michael Niedermayer
a72580fc9e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
binkvideo: simplify and remove invalid shifts
pulse: compute frame_duration once and fix it
lavf: simplify format_child_class_next()
hwaccel: OS X Video Decoder Acceleration (VDA) support.
doc: add support for an optional navigation bar in texi2html pages
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h
libavcodec/version.h
libavformat/options.c
libavutil/avutil.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 03:13:42 +01:00
Michael Niedermayer
be4c9a440f
mpeg4videodec: dont treat empty frames as errors for QMP4, it seems thats normal.
...
Fixes remaining complaints in Ticket560 possibly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 02:25:19 +01:00
Michael Niedermayer
66cd3c12ab
mpegaudio: prettify avpriv_mpa_bitrate_tab
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 01:59:59 +01:00
Clément Bœsch
edc26bfae5
vda: use K&R style.
2011-11-15 00:41:36 +01:00
Sebastien Zwickert
81852ef5d6
vda: get correctly the frame from h264 context.
2011-11-14 22:24:03 +01:00
Sebastien Zwickert
4590e161e6
vda: check allocation result.
2011-11-14 22:24:03 +01:00
Sebastien Zwickert
c7fa3eeab9
vda: removes useless casts.
2011-11-14 22:24:03 +01:00
Sebastien Zwickert
6e1e49385e
vda: cosmetic.
2011-11-14 22:24:03 +01:00
Sebastien Zwickert
b46134f659
vda: reordering headers inclusion.
2011-11-14 22:24:03 +01:00
Sebastien Zwickert
9837442a39
vda: undef Picture.
2011-11-14 22:24:02 +01:00
Michael Niedermayer
ecf5e70548
vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 18:29:37 +01:00
Michael Niedermayer
75c0ddc9c2
vble: move 2nd pass bitreading into vble_restore_plane()
...
this improves data cache hits and speeds up grayscale only decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 18:29:29 +01:00
Michael Niedermayer
6718536ba5
diracdec: fix empty data units.
...
Fixed Ticket636
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 18:14:20 +01:00
Mans Rullgard
3f5d6a665a
binkvideo: simplify and remove invalid shifts
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-14 15:35:29 +00:00
Sebastien Zwickert
ac3dbb4d58
hwaccel: OS X Video Decoder Acceleration (VDA) support.
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-11-14 16:07:32 +01:00
KO Myung-Hun
ad0bdd2fd2
lavc: add supports of OS/2 threads
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:33:09 +01:00
Carl Eugen Hoyos
9117592549
Cosmetics: Increase readability.
2011-11-13 15:43:09 +01:00
Carl Eugen Hoyos
eb664d4ae3
Increase Westwood Studios VQA palette dynamics.
2011-11-13 15:12:43 +01:00
Carl Eugen Hoyos
1fc573dd25
Increase Sierra VMD palette dynamics.
2011-11-13 15:04:29 +01:00
Carl Eugen Hoyos
a95906af57
Increase Pictor/PC Paint palette dynamics.
2011-11-13 14:52:21 +01:00
Carl Eugen Hoyos
105cf82acb
Increase FLI/FLC Animation palette dynamics for some samples.
2011-11-13 14:50:01 +01:00
Carl Eugen Hoyos
2b656844f8
Increase eXtended BINary text palette dynamics.
2011-11-13 14:42:22 +01:00
Carl Eugen Hoyos
942e9be5d7
Increase Bethesda VID palette dynamics.
2011-11-13 14:40:32 +01:00
Carl Eugen Hoyos
7ea77a6197
Set some Pictor/PC Paint palettes opaque.
2011-11-13 03:08:25 +01:00
Carl Eugen Hoyos
0d49dd3725
Set more KMVC palettes opaque.
2011-11-13 03:01:30 +01:00
Carl Eugen Hoyos
789da2e9f1
Set second Delphine Software International CIN palette opaque.
2011-11-13 02:47:47 +01:00
Michael Niedermayer
545ec935a4
h264: Use mismatching frame numbers in fields to synchronize the
...
first/second field state independant of them being reference or not.
Fixes Ticket354
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:18 +01:00
Dominique Leuenberger
8a25d0a860
Trivial: j2kenc: fix compiler warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 21:00:12 +01:00
Carl Eugen Hoyos
3230c756f8
Increase Bitmap Brothers JV palette dynamics.
...
Approved-by: Peter Ross
2011-11-12 20:56:07 +01:00
Carl Eugen Hoyos
9780c33eca
Increase Psygnosis YOP palette dynamics.
2011-11-12 20:49:53 +01:00
Carl Eugen Hoyos
ac0042f55f
Set Psygnosis YOP palette opaque.
2011-11-12 20:48:39 +01:00
Carl Eugen Hoyos
0e8da94c2f
Increase AVS palette dynamics.
2011-11-12 20:47:33 +01:00
Carl Eugen Hoyos
7b40f46fe2
Set AVS palette opaque.
2011-11-12 20:46:58 +01:00
Carl Eugen Hoyos
1d38c746fd
Set Westwood Studios VQA palette opaque.
2011-11-12 20:23:34 +01:00
Carl Eugen Hoyos
90f75f9804
Set Sierra VMD palette opaque.
2011-11-12 20:22:01 +01:00
Carl Eugen Hoyos
e9a2ffa117
Set Beam Software VB palette opaque.
2011-11-12 20:21:07 +01:00
Carl Eugen Hoyos
3b5733bcf9
Set TIFF default grascale palette opaque.
2011-11-12 20:19:51 +01:00
Carl Eugen Hoyos
fd09cd08c0
Set Tiertex Limited SEQ palette opaque.
2011-11-12 20:19:07 +01:00
Carl Eugen Hoyos
58c3538839
Set Sun Rasterfile palette opaque.
2011-11-12 20:17:56 +01:00
Carl Eugen Hoyos
7cd906c179
Set Smacker palette opaque.
2011-11-12 20:16:43 +01:00
Carl Eugen Hoyos
c99cd3e2e2
Set RL2 palette opaque.
2011-11-12 20:15:56 +01:00
Carl Eugen Hoyos
9f9a1f424e
Set QuickDraw palette opaque.
2011-11-12 20:15:21 +01:00
Carl Eugen Hoyos
3bf54ab565
Set American Laser Games MM palette opaque.
2011-11-12 20:13:58 +01:00
Carl Eugen Hoyos
64176bc1a3
Set KMVC palette opaque.
2011-11-12 20:13:14 +01:00
Carl Eugen Hoyos
4e8078e6a8
Set FLI/FLC Animation palette opaque.
2011-11-12 20:09:56 +01:00
Carl Eugen Hoyos
c0be4ea0f2
Set Electronic Arts TGV palette opaque.
2011-11-12 20:08:56 +01:00
Carl Eugen Hoyos
f628134e77
Set Electronic Arts CMV palette opaque.
2011-11-12 20:08:23 +01:00
Carl Eugen Hoyos
1567243e8f
Set ScummVM DXA palette opaque.
2011-11-12 20:07:31 +01:00
Carl Eugen Hoyos
dcbd18c615
Set Delphine Software International CIN palette opaque.
2011-11-12 20:06:35 +01:00
Carl Eugen Hoyos
e18f70c2d1
Set Chronomaster DFA palette opaque.
2011-11-12 20:05:35 +01:00
Carl Eugen Hoyos
320f0f04a1
Fix Chronomaster DFA palette.
...
The palette had a blue cast.
2011-11-12 20:03:44 +01:00
Carl Eugen Hoyos
973f3d3e0e
Set CD Graphics palette opaque.
2011-11-12 20:01:50 +01:00
Carl Eugen Hoyos
5be097c703
Set Interplay C93 palette opaque.
2011-11-12 20:01:05 +01:00
Carl Eugen Hoyos
d6e14e24b0
Set Discworld II BMV palette opaque.
2011-11-12 19:37:24 +01:00
Carl Eugen Hoyos
3fd9f08971
Set BFI palette opaque.
2011-11-12 19:36:23 +01:00
Carl Eugen Hoyos
f98722443f
Set Bethesda VID palette opaque.
2011-11-12 19:34:07 +01:00
Carl Eugen Hoyos
0c5fd6372e
Do not try to read 16bit gray png files with alpha channel.
...
FFmpeg does not support gray16a.
Fixes the crash in ticket #644 .
2011-11-12 19:30:27 +01:00
Peter Ross
070d2d7589
jvdec: set alpha component
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 04:26:37 +01:00
Peter Ross
341d4903a6
set ff_cga_palette and ff_ega_palette alpha component
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 04:26:37 +01:00
Michael Niedermayer
ef97d59fb3
vble: remove flags copy, its not used in any speed relevant code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:12:13 +01:00
Michael Niedermayer
2fea60c600
vble: remove len array, its unneeded
...
also remove unneeded memset()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:11:22 +01:00
Michael Niedermayer
177bcc1ad9
vble: remove unused variable len.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:08:49 +01:00
Michael Niedermayer
dde0af2df1
vble: move get_bits_left() check out of inner loop, we can perform the check completely before the loop.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:08:38 +01:00