Michael Niedermayer
f35439699f
Merge remote branch 'qatar/master'
...
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 02:28:01 +02:00
Michael Niedermayer
85c9365d65
Revert "configure: use dlltools instead of lib.exe"
...
Reason, is this was requested by the windows experts / seems dlltool causes alot of problems
This reverts commit ec10a9ab46
.
Conflicts:
configure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 02:06:31 +02:00
Mans Rullgard
bc154882e1
Fixed-point MDCT with 32-bit unscaled output
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-02 21:06:07 +01:00
Michael Niedermayer
679191a5df
yadif:Fix assert() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 20:27:07 +02:00
Michael Niedermayer
c4804feca2
dpx:fix typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 19:26:58 +02:00
Peter Ross
ba24c5a3d3
cosmetics: indentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 18:30:33 +02:00
Peter Ross
4ec720059c
dpx encoder: support 10-bit packing method
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 18:30:08 +02:00
Peter Ross
1b5282a221
dpx decoder: read sample aspect ratio
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 18:19:01 +02:00
Michael Niedermayer
4ce776d636
H264: fix slice end error detection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 17:59:10 +02:00
Michael Niedermayer
0d5e6843b4
h264: change a few comments into error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 17:57:53 +02:00
Anton Khirnov
ed5fcd60b2
lavc: deprecate rate_emu
...
It's not used anywhere and apparrently hasn't been for a very long time.
2011-04-02 16:18:37 +02:00
Anton Khirnov
8ed2ae09a2
lavc: mark hurry_up for removal on next major bump
...
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
2011-04-02 16:17:24 +02:00
Anton Khirnov
9073ca6c6e
parser: mark av_parser_parse() for removal on next major bump
...
Fixes build with the bump, since the prototype is already marked for
removal.
2011-04-02 16:17:15 +02:00
Anton Khirnov
6f3d3eacf6
lavc: add missing audioconvert includes
2011-04-02 16:17:01 +02:00
Anton Khirnov
b4b167ecbf
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
2011-04-02 16:16:44 +02:00
Michael Niedermayer
b25d931a82
Fix stream mapping regression
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 16:15:16 +02:00
Stefano Sabatini
7dd29fb606
drawtext: extend/clarify examples in the filter description
2011-04-02 11:50:48 +02:00
Stefano Sabatini
7e3373d2cf
drawtext: fix wrong reference in boxcolor option description
2011-04-02 11:48:19 +02:00
Stefano Sabatini
17be8ef709
drawtext: add documentation for the shadow parameters
2011-04-02 11:48:08 +02:00
Stefano Sabatini
0fff764bdb
drawtext: allow negative shadow offset values
2011-04-02 11:48:01 +02:00
Michael Niedermayer
4defa68fe2
Merge remote branch 'qatar/master'
...
* qatar/master:
ac3enc: ARM optimised ac3_compute_matissa_size
ac3: armv6 optimised bit_alloc_calc_bap
fate: simplify fft test rules
avio: document avio_alloc_context.
lavf: make compute_chapters_end less picky.
sierravmd: fix Indeo3 videos
FFT: simplify fft8()
fate: add fixed-point fft/mdct tests
Fixed-point support in fft-test
ape: check that number of seektable entries is equal to number of frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 01:54:27 +02:00
Michael Niedermayer
a2f5e14a86
Timeout TCP open() after 5 seconds.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 00:56:43 +02:00
Carl Eugen Hoyos
ecf94986c8
Fix compilation with --disable-vdpau
2011-04-02 00:50:39 +02:00
Carl Eugen Hoyos
2a0bd2bfc9
Make a plausibility check when setting channel layout for TrueHD.
...
TrueHD supports more channels than FFmpeg, so a valid sample
could set the channel layout to a value that represents less
channels than the sample actually consists of.
2011-04-02 00:48:43 +02:00
Carl Eugen Hoyos
e1cfe04c76
Match the documentation of -s with the current implementation.
2011-04-02 00:25:57 +02:00
Mans Rullgard
aa05f2126e
ac3enc: ARM optimised ac3_compute_matissa_size
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 22:46:21 +01:00
Mans Rullgard
182826c884
ac3: armv6 optimised bit_alloc_calc_bap
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 22:46:05 +01:00
Mans Rullgard
5085a1a068
fate: simplify fft test rules
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 20:53:19 +01:00
Anton Khirnov
3c96c64821
avio: document avio_alloc_context.
2011-04-01 20:02:32 +02:00
Anton Khirnov
ab11317c1f
lavf: make compute_chapters_end less picky.
...
In particular, now it assumes that
a) chapters are chronologically ordered
b) chapters have the same timebases
c) duration of the stream is known
and asserts if any of these is not met.
Make it properly deal with harsher conditions.
fixes issue2320
2011-04-01 19:53:55 +02:00
Reimar Döffinger
7b9750ed9b
Fix doxy-style for comment ("///>" should be "///<" instead).
2011-04-01 19:42:31 +02:00
Matthew Hoops
0e635f3e86
sierravmd: fix Indeo3 videos
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-01 19:29:08 +02:00
Reimar Döffinger
9b7a0c5d88
Allow selecting VDPAU, XvMC via get_format for MPEG-2
...
To avoid further special-casing, dummy AVHWAccels are added
for VDPAU.
It should be possible to move VDPAU completely to AVHWAccel later.
2011-04-01 19:13:24 +02:00
Mans Rullgard
41327cca61
FFT: simplify fft8()
...
Part of the fft8() function corresponds to the BUTTERFLIES macro,
so use it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 17:50:59 +01:00
Michael Niedermayer
e7c7b0d000
Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people).
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 17:38:29 +02:00
Michael Niedermayer
a0350330cd
Move flv format #defines to common header so they can be used by the encoder too.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 17:38:29 +02:00
Mans Rullgard
b41a108914
fate: add fixed-point fft/mdct tests
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 15:16:06 +01:00
Mans Rullgard
6efe6028ed
Fixed-point support in fft-test
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 15:16:06 +01:00
Peter Ross
6408529b5d
Increase ffmpeg video encoding buffer size to permit encoding of DPX images
...
The header generated by the DPX encoder is 1664 bytes.
2011-04-01 23:11:54 +11:00
Peter Ross
c178fdeaec
Add .dpx to the list of supported file extensions for the image2 muxer
2011-04-01 23:11:24 +11:00
Peter Ross
f339f908a4
DPX image encoder
2011-04-01 23:10:26 +11:00
Michael Niedermayer
0c4d4a9355
Cleanup flv keyframe index reading and add some saftey checks.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 13:34:32 +02:00
Michael Niedermayer
676d380f2a
Fix undefined behavior in ffv1 with insane widths.
...
The new tables is large enough to prevent this together with our image size checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 12:49:52 +02:00
Kostya Shishkov
29a290439b
ape: check that number of seektable entries is equal to number of frames
...
fixes issue2480
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-01 09:34:44 +02:00
Michael Niedermayer
7ac167493e
Merge remote-tracking branch 'newdev/master'
...
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 02:58:15 +02:00
Michael Niedermayer
859676dd42
Insert setdar at the begin of a filter chain instead the end.
...
This fixes -vf setsar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 02:14:46 +02:00
Michael Niedermayer
b1ca9642a2
Revert "Remove support for stripping executables"
...
People did not like this change.
This reverts commit e0be794a71
.
2011-04-01 00:24:12 +02:00
Peter Ross
607cd90cdb
make image2 muxer/demuxer support sequence of individual rawvideo files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-31 23:26:28 +02:00
Peter Ross
0bb240acb3
img2: stop using CODEC_ID_RAWVIDEO to trigger processing of independant y/u/v image files
...
This is requireed, as img2 will be modified soon to support .raw image file sequences.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-31 23:26:18 +02:00
Jindrich Makovicka
e006d71fa8
mpegts: propagate avio EOF in read_packet()
...
Allows distinguishing between EOF and IO error in read_packet return code.
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-31 19:46:28 +02:00