Michael Niedermayer
f70d0212ce
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
ftp: enhanced error handling
ftp: reconnect on seek
ftp: move common commands code to function
ftp: enhanced status code handling
ftp: reconnect on read
ftp: move create control connection to function
ftp: credentials moved into FTPContext
ftp: rename function name
ftp: formatting and typos fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6e073dd127
configure: check for nanosecond precission stat
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
887d74c47e
av_d2q: Add a special case for |value| > MAX and |value| < 1/MAX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Lukasz Marek
ddbcc48b64
ftp: enhanced error handling
...
Add error codes to expected codes to make responses faster.
Success of a command is validated by comparing code to a success code.
12 years ago
Lukasz Marek
34c423894c
ftp: reconnect on seek
...
ABOR command usually takes long (FTP server implementation dependent).
It also produces different response codes from different servers.
It is save for ffmpeg to reconnect both connection during seek for two reasons:
1. Alreay mentioned heavy manner of ABOR command.
2. Server may disconnected due to no transfer (seek after a long pause in ffmpeg client)
12 years ago
Lukasz Marek
d99beeb70e
ftp: move common commands code to function
...
Each send command routine requires the same steps.
This commit moves repeated code into one function.
12 years ago
Lukasz Marek
3f00521809
ftp: enhanced status code handling
...
Reimplementation of ftp_status function.
New version requires explicit list of expected codes.
It flush data connection input before sending a command
and blocks until expected result appears.
12 years ago
Lukasz Marek
1931c2d265
ftp: reconnect on read
...
FTP server may disconnect after some period of time when no transfer is done.
FTP protocol should reconnect and seek to last position.
12 years ago
Lukasz Marek
c84d6aa2f6
ftp: move create control connection to function
...
Move common code that opens control connection to function.
This code can be reused when reconnecting to FTP server
after inactivity.
12 years ago
Lukasz Marek
e46e49e31d
ftp: credentials moved into FTPContext
...
FTP server may disconnect client.
This commit stores credentials for future reconnect.
12 years ago
Lukasz Marek
80cce899f6
ftp: rename function name
...
ftp_send_command was used only once.
This commit makes this function specific, not generic
12 years ago
Lukasz Marek
afa30e51d1
ftp: formatting and typos fixes
12 years ago
Michael Niedermayer
f77467a11d
jpeg2000dec: fix indention
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c1415cfefb
jpeg2000dec: print more detailed cdx/y debug info
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f0b9bd807b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
proresenc: alpha coding support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
7de8a38160
lavfi/vignette: remove extra semi-colon.
12 years ago
Michael Niedermayer
9d56ccf5af
j2k/jpeg2000dec: merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
fd7e119037
jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
192050d7a7
jpeg2000dec: merge sgnd fix from j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5dbbb762e5
jpeg2000dec: merge struct field types from j2k
...
Fixes AVOption type mismatch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
89f472b3ee
j2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
45c0e338fc
j2kdec: merge picture handling from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f471b5fa30
j2k: restructure bitstream decoding
...
This is based on jpeg2000 but differs because of
problems with the design from jpeg2000 with currently
supported files
More files can be decoded after this commit, though they
show heavy artifacts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
cdb86136f7
j2k/jpeg2000: merge some of the tilepart related code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a5203d86b3
j2kdec: merge length==0 check from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f67f2681da
jpeg2000deci/j2kdec: fix sizeof types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
20a2d5ec11
jpeg2000dec: fix ff_mqc_initdec() and data setup order
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7a2b634220
jpeg2000dec: simplify init_tile() / merge from j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Matthieu Bouron
f468325d34
lavf/id3v2enc: fix cover art display on some software
...
Adding an arbitrary amount of padding bytes at the end of the
ID3 metadata fixes cover art display for some software (iTunes,
Traktor, Serato, Torq).
For reference (ID3 metadata):
[ Apic frames ] -> cover doesn't show up
[ Apic frames, Padding ] -> ok
[ Apic frames, ID3 frames ] -> ok
[ ID3 frames, Apic frames ] -> cover doesn't show up
[ ID3 frames, Apic frames, Padding ] -> ok
12 years ago
Paul B Mahol
c4e0e31424
tta: remove pointless code
...
Checking seek table crc in decoder is pointless, as seek table is not used in
decoder anyway, so also stop storing seek table into extradata.
12 years ago
Clément Bœsch
2886e8065e
lavfi/vignette: add aspect option.
12 years ago
Clément Bœsch
33620e243f
lavfi/vignette: add some scaling debug.
12 years ago
Clément Bœsch
bfafcc4ebe
lavfi/vignette: simplify dmax definition.
12 years ago
Clément Bœsch
cf6f179044
lavfi/vignette: fix scale with aspects smaller than one.
12 years ago
Michael Niedermayer
826b3a75cd
h264_cavlc: fix reading skip run
...
Fixes Ticket2606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
3f714d1ffd
jpeg2000/j2k: merge non functional changes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
941a8efae2
j2k:decode_tile() pass picture as argument
...
Reduce diff to jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9ccc9f30f7
jpeg2000: drop red-blue swap
...
This should no longer be needed as the pix fmt was updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7836583934
j2kdec: s/j2k_/jpeg2000_/
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
4a85390d29
lavfi/vignette: make sure a sane sar is set.
12 years ago
Clément Bœsch
0ab9362fcb
lavfi: add vignette filter.
12 years ago
Michael Niedermayer
310f9dd698
j2k/jpeg2000: merge pix_fmt setting code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6f7de3d5c8
mpegvideo_enc: allow mpeg_quant to be set in mpeg2video
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
62d00aa22f
jpeg2000/j2k: merge j2k/jpeg2000.c/h
...
Now only j2kdec / jpeg2000dec.c remain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c2ac389bba
jpeg2000: remove unneeded casts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
09e03a8467
jpeg2000: merges quantization fixes from j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
efc2df2e27
jpeg2000: remove unneeded variable initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
84a6bc2357
jpeg2000: tag_tree_size: replace check by assert
...
This function is never called with values large enough for the
error condition to occur
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8bedbb82ce
j2k/jpeg2000: split data pointer in int & float.
...
This fixes a TODO item and unifies both decoders structures
It also fixes undefined behavior due to aliasing violations
I choose 2 fields instead of a union because mistakely using the
wrong type with a union will lead to hard to debug "wrong output"
while with 2 fields mistakely using the wrong type will crash
with a null pointer derefernce which is much easier to debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Carl Eugen Hoyos
b3af9242d0
Use -lX11 -lXext when linking Xv output device.
...
Reviewed-by: Stefano Sabatini
12 years ago