Paul B Mahol
6b024d8a7a
avcodec/xan: use uint8_t instead of unsigned char
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 17:18:17 +00:00
Paul B Mahol
6508bd4aa3
pixfmt: add native GBRAP16 format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 16:59:32 +00:00
Paul B Mahol
898c6191ff
lavfi: Weston 3 Field Deinterlacing Filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 12:46:56 +00:00
Michael Niedermayer
911a100da9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avisynth: K&R formatting cosmetics
Conflicts:
libavformat/avisynth.c
Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:52:59 +02:00
Michael Niedermayer
86ca6a7568
Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'
...
* commit '97b052e56807fab6887e9ba210a28a622e6a4b78':
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:39:15 +02:00
Michael Niedermayer
c4a696fb54
Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'
...
* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
avcodec: Stop exporting the removed audio_resample* symbols
Conflicts:
libavcodec/libavcodec.v
Not merged as theres no pressing need to remove it now.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:17:12 +02:00
Michael Niedermayer
2a27e52550
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
...
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
mpeg12enc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:00:47 +02:00
Michael Niedermayer
61845dc74a
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
...
* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
mpeg12enc: drop forward declarations
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 12:34:09 +02:00
Michael Niedermayer
5866c107a9
Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'
...
* commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b':
mem: Do not check unsigned values for negative size
Conflicts:
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 12:21:16 +02:00
Michael Niedermayer
92424a45d0
Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'
...
* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
mem: Improve documentation wording and spelling
Conflicts:
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 12:05:02 +02:00
Diego Biurrun
c16ddcc90b
avisynth: K&R formatting cosmetics
2013-09-06 11:13:36 +02:00
Diego Biurrun
97b052e568
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
2013-09-06 09:09:07 +02:00
Michael Niedermayer
bcd1c20612
avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()
...
Fixes Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 02:33:10 +02:00
Michael Niedermayer
b155fb08b8
avcodec/mjpegdec: move shift_output() to its own function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 02:31:32 +02:00
Michael Niedermayer
c407c73457
avcodec/mjpegdec: 12bit Grayscale support
...
Fixes part of Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
Michael Niedermayer
1deeb9437c
avcodec/mjpegdec: Fix normal jpeg with bits < 8
...
Untested due to lack of testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
Michael Niedermayer
15071ed4fc
avcodec/mjpegdec fix last_dc for bits != 8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
Michael Niedermayer
ae57e82469
avcodec/dsputil: add 12bit simple idct
...
Will be needed for jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
Paul B Mahol
d2e237338d
lavfi/mp: remove mp=fil
...
The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-05 20:22:47 +00:00
Diego Biurrun
befe044bb9
avcodec: Stop exporting the removed audio_resample* symbols
2013-09-05 22:11:36 +02:00
Paul B Mahol
0a8bb91505
lavfi/mp: remove mp=dint
...
There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-05 20:03:36 +00:00
Vittorio Giovara
7f93a861aa
mpeg12enc: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-05 21:50:24 +02:00
Michael Niedermayer
59b9ecc92a
avfilter/vf_yadif: Treat mode as a field of flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 20:53:12 +02:00
Michael Niedermayer
4ff5b2683c
avfilter/vf_yadif: fix "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 19:58:45 +02:00
Michael Niedermayer
a67dcd74ab
avfilter/vf_yadif: add gbr(a)p support
...
Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 14:06:17 +02:00
Michael Niedermayer
2230d85ceb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
matroskaenc: Allow chapters to be written in trailer
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 13:34:37 +02:00
Vittorio Giovara
66f091053f
mpeg12enc: drop forward declarations
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-05 12:38:43 +02:00
Diego Biurrun
c3e6e8f06c
mem: Do not check unsigned values for negative size
2013-09-05 12:38:43 +02:00
Diego Biurrun
b634b36fce
mem: Improve documentation wording and spelling
2013-09-05 12:38:43 +02:00
Michael Niedermayer
b042712a87
avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Michael Niedermayer
b394ccfe47
avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform
...
untested due to lack of sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Michael Niedermayer
38f8640df8
avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transforms
...
Fixes Ticket2826
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Michael Niedermayer
4ced30908f
avcodec/jpeg2000dec: make SOC finding code more robust
...
Fixes file from Ticket860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Michael Niedermayer
cb026ac303
avcodec/mjpegdec: make "unknown colorspace" error more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Michael Niedermayer
61c68000ed
avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
...
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 01:39:20 +02:00
Clément Bœsch
f974289671
doc/APIchanges: update hashes and dates after last two commits.
...
Sorry, I'm too lazy to fix the rest.
2013-09-04 22:18:59 +02:00
Clément Bœsch
3e1f507f3e
avcodec: make avcodec_close() more tolerant.
...
See previous commit.
2013-09-04 22:06:38 +02:00
Clément Bœsch
36cd017acd
avformat: make avformat_close_input() more tolerant.
...
The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.
2013-09-04 22:06:38 +02:00
Clément Bœsch
bc68927a0f
tools/crypto_bench: fix 2 typos.
2013-09-04 21:59:34 +02:00
Michael Niedermayer
9cbb3fce59
avcodec/avpacket: zero memory in av_packet_new_side_data()
...
This ensures that no uninitialized bytes cause non-deterministic behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 21:00:24 +02:00
John Stebbins
26b241c079
matroskaenc: Allow chapters to be written in trailer
...
This allows creation of frame accurate chapter marks from sources like
DVD and BD where the precise chapter location is not known until the
chapter mark has been reached during reading.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-04 20:30:43 +02:00
Nicolas George
04dcdc4640
lavc/avfft: init context to 0.
...
Prevent an invalid free in case of init failure.
2013-09-04 16:37:25 +02:00
Nicolas George
83635ac67b
ffprobe: show bitmap subtitles size.
...
Fix trac ticket #2930 .
2013-09-04 16:36:28 +02:00
Nicolas George
d7ccfe58e3
lavc/libvorbisdec: do not return empty frames.
...
Some parts of the code have been known to react badly to
empty frames; they should not, but there is no need to
take risks.
2013-09-04 16:36:20 +02:00
Nicolas George
d5b58f678d
tools: add benchmark for crypto functions.
...
The benchmark tests the speed of the following algorithms:
MD5, SHA-1, SHA-256, SHA-512, RIPEMD-160, AES-128.
It can optionally be built to perform the same benchmark on
other crypto libraries, for comparison purposes.
The supported libraries are:
- crypto: OpenSSL's libcrypto;
- gcrypt: GnuTLS's libgcrypt;
- tomcrypt: LibTomCrypt
To enable them, use this syntax:
make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench
They do not need to have been enabled in configure.
2013-09-04 16:36:11 +02:00
Clément Bœsch
dc8f732292
doc/examples: fix lib math dep for resampling_audio.
...
It uses at least sin()
2013-09-04 15:49:18 +02:00
Clément Bœsch
2c1eb38e5e
avcodec: fix AVpacket → AVPacket typo.
2013-09-04 15:48:11 +02:00
Clément Bœsch
98b9bbb787
doc/examples: remove extra "the".
...
"into the doc/examples directory" vs "into doc/examples".
2013-09-04 15:46:31 +02:00
Michael Niedermayer
2ffead98dd
avcodec: add emuedge_linesize_type
...
Currently all uses of the emu edge code as well as the code itself
assume int linesize
changing some but not changing all would introduce a security issue
once all use this typedef a simple search and replace can be
done to switch them all to ptrdiff_t
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 14:29:20 +02:00
Michael Niedermayer
3eeca8b0e4
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: Avoid 32-bit wrapping of linesize multiplications
This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 14:19:22 +02:00