ffmpeg.git
6 years agoMerge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'
Michael Niedermayer [Mon, 3 Jun 2013 10:21:25 +0000 (12:21 +0200)]
Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'

* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423':
  vmd: fix mode 3 decoding

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
Michael Niedermayer [Mon, 3 Jun 2013 09:53:05 +0000 (11:53 +0200)]
Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'

* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
Michael Niedermayer [Mon, 3 Jun 2013 09:44:11 +0000 (11:44 +0200)]
Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'

* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
  tiff: K&R formatting cosmetics

Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 3 Jun 2013 00:59:10 +0000 (02:59 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/trim: mark link closed on EOF.
  ffmpeg: ignore EOF when pushing frames to filters.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: remove redundant error log message
Paul B Mahol [Mon, 3 Jun 2013 00:19:37 +0000 (00:19 +0000)]
jpeg2000dec: remove redundant error log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agowavpack: remove redundant error log message
Paul B Mahol [Mon, 3 Jun 2013 00:16:39 +0000 (00:16 +0000)]
wavpack: remove redundant error log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotta: use interger instead of pointer to iterate output samples for 24-bit case
Paul B Mahol [Sun, 2 Jun 2013 22:43:31 +0000 (22:43 +0000)]
tta: use interger instead of pointer to iterate output samples for 24-bit case

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotta: move GetBitContext out of private context
Paul B Mahol [Sun, 2 Jun 2013 22:32:19 +0000 (22:32 +0000)]
tta: move GetBitContext out of private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/trim: mark link closed on EOF.
Nicolas George [Sun, 2 Jun 2013 09:35:04 +0000 (11:35 +0200)]
lavfi/trim: mark link closed on EOF.

Fix trac ticket #2620.

6 years agoffmpeg: ignore EOF when pushing frames to filters.
Nicolas George [Sun, 2 Jun 2013 09:30:52 +0000 (11:30 +0200)]
ffmpeg: ignore EOF when pushing frames to filters.

EOF is not a fatal condition, it is normally produced
by a few filters.

TODO: take it into account to avoid useless decoding.

6 years agotools/qt-faststart: Fix unintended sign extension of current_offset
Michael Niedermayer [Sun, 2 Jun 2013 21:10:44 +0000 (23:10 +0200)]
tools/qt-faststart: Fix unintended sign extension of current_offset

Fixes: CID733809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/qt-faststart: Fix unintended sign extension of atom_size
Michael Niedermayer [Sun, 2 Jun 2013 21:07:06 +0000 (23:07 +0200)]
tools/qt-faststart: Fix unintended sign extension of atom_size

Fixes CID733810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ffhash: close file handle on error
Michael Niedermayer [Sun, 2 Jun 2013 20:52:23 +0000 (22:52 +0200)]
tools/ffhash: close file handle on error

Fixes CID1026768

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ffeval: Check return value of av_expr_parse_and_eval()
Michael Niedermayer [Sun, 2 Jun 2013 20:48:03 +0000 (22:48 +0200)]
tools/ffeval: Check return value of av_expr_parse_and_eval()

Fixes CID1026745

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovmd: fix mode 3 decoding
Kostya Shishkov [Sat, 1 Jun 2013 17:19:28 +0000 (19:19 +0200)]
vmd: fix mode 3 decoding

6 years agoavutil/sha: reorder Maj arguments
Michael Niedermayer [Sun, 2 Jun 2013 15:10:43 +0000 (17:10 +0200)]
avutil/sha: reorder Maj arguments

about 1% speedup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: ppc: Remove commented-out define cruft
Diego Biurrun [Wed, 15 May 2013 22:28:17 +0000 (00:28 +0200)]
swscale: ppc: Remove commented-out define cruft

6 years agonsvdec: Remove commented-out debug cruft
Diego Biurrun [Wed, 15 May 2013 22:28:03 +0000 (00:28 +0200)]
nsvdec: Remove commented-out debug cruft

6 years agocpu: Restructure code to avoid pointless ret variable indirection
Diego Biurrun [Sat, 1 Jun 2013 13:38:51 +0000 (15:38 +0200)]
cpu: Restructure code to avoid pointless ret variable indirection

libavutil/cpu.c:133:9: warning: unused variable ‘ret’ [-Wunused-variable]

6 years agotiff: K&R formatting cosmetics
Diego Biurrun [Sat, 1 Jun 2013 13:35:11 +0000 (15:35 +0200)]
tiff: K&R formatting cosmetics

6 years agotta encoder
Paul B Mahol [Mon, 27 May 2013 13:52:36 +0000 (13:52 +0000)]
tta encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotta: move code that will be shared with encoder to separate file
Paul B Mahol [Mon, 27 May 2013 19:28:09 +0000 (19:28 +0000)]
tta: move code that will be shared with encoder to separate file

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoFix compilation of libavcodec/tiff.c
Carl Eugen Hoyos [Sun, 2 Jun 2013 14:50:39 +0000 (16:50 +0200)]
Fix compilation of libavcodec/tiff.c

6 years agotiff: planar rgb
Paul B Mahol [Thu, 9 May 2013 19:39:32 +0000 (19:39 +0000)]
tiff: planar rgb

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavutil/sha512: Reshuffle Maj() operands
Michael Niedermayer [Sun, 2 Jun 2013 11:18:16 +0000 (13:18 +0200)]
avutil/sha512: Reshuffle Maj() operands

This reduces dependancy chains and improves speed by about 2%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: Add SHA-2 512 hashing
James Almer [Thu, 30 May 2013 07:56:29 +0000 (04:56 -0300)]
lavu: Add SHA-2 512 hashing

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agouse Kostyas full name in copyrights
Michael Niedermayer [Sun, 2 Jun 2013 09:22:40 +0000 (11:22 +0200)]
use Kostyas full name in copyrights

This fixes 2 files that where not part of the original change
See: de421b208578386bfb4416c67c9922877e670049

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Jun 2013 08:52:48 +0000 (10:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  network: factor out connect-listening code

Conflicts:
libavformat/network.h
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'
Michael Niedermayer [Sun, 2 Jun 2013 08:30:35 +0000 (10:30 +0200)]
Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: use TARGET_SAMPLES in mcdeint tests
Michael Niedermayer [Sat, 1 Jun 2013 23:58:33 +0000 (01:58 +0200)]
fate: use TARGET_SAMPLES in mcdeint tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotta: use get_unary()
Paul B Mahol [Sat, 1 Jun 2013 23:06:04 +0000 (23:06 +0000)]
tta: use get_unary()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 1 Jun 2013 21:46:56 +0000 (23:46 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
  ffplay: do not allow wider window than 16383
  ffplay: use 0 frame delay if redisplaying an already displayed frame
  ffplay: use more sane frame timer resetting logic
  ffplay: only update pts if not redisplaying a frame
  ffplay: fix compute_target_delay to better handle frames with long durations
  ffplay: if playing only audio or video only, show the master clock diff in status line
  ffplay: factorize clock functions
  ffplay: decrease video picture queue size to 3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/mp: drop mcdeint wrapper
Stefano Sabatini [Sat, 1 Jun 2013 20:30:00 +0000 (22:30 +0200)]
lavfi/mp: drop mcdeint wrapper

It was ported to a native libavfilter filter.

6 years agotests: add mcdeint tests
Stefano Sabatini [Tue, 28 May 2013 11:41:41 +0000 (13:41 +0200)]
tests: add mcdeint tests

6 years agolavfi: port mcdeint filter from libmpcodecs
Stefano Sabatini [Tue, 28 May 2013 11:40:39 +0000 (13:40 +0200)]
lavfi: port mcdeint filter from libmpcodecs

6 years agolavfi/mp/mcdeint: avoid uninited data read
Stefano Sabatini [Thu, 30 May 2013 22:36:50 +0000 (00:36 +0200)]
lavfi/mp/mcdeint: avoid uninited data read

Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.

This avoids non visible artifacts which affected the output checksum.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200

6 years agolavc/avcodec: decodimg → decoding.
Clément Bœsch [Sat, 1 Jun 2013 17:16:37 +0000 (19:16 +0200)]
lavc/avcodec: decodimg → decoding.

6 years agoFix libcdio-paranoia detection.
Carl Eugen Hoyos [Sat, 1 Jun 2013 16:34:51 +0000 (18:34 +0200)]
Fix libcdio-paranoia detection.

Fixes ticket #2614.

6 years agonetwork: factor out connect-listening code
Luca Barbato [Fri, 31 May 2013 01:05:13 +0000 (03:05 +0200)]
network: factor out connect-listening code

Introduce ff_listen_connect, to be shared with the other
non-tcp network protocols.

6 years agonetwork: factor out bind-listening code
Luca Barbato [Wed, 29 May 2013 23:08:51 +0000 (01:08 +0200)]
network: factor out bind-listening code

Introduce ff_listen_bind, to be shared with the other non-tcp
network protocols.

6 years agolavf/webvttdec: factorize identifier and settings side data code.
Clément Bœsch [Sat, 1 Jun 2013 13:08:00 +0000 (15:08 +0200)]
lavf/webvttdec: factorize identifier and settings side data code.

6 years agolavf/webvttdec: save cue id and settings as side data
Matthew Heaney [Fri, 31 May 2013 23:27:32 +0000 (16:27 -0700)]
lavf/webvttdec: save cue id and settings as side data

Currently the WebVTT demuxer parses the cues but throws away
the cue id (the optional first line of the cue) and cue
settings (the optional rendering instructions that follow
the timestamp).

However, in order to write inband text tracks (to WebM
files), the entire cue payload from the WebVTT source must
be preserved.

This commit makes no change to the data part of the output
buffer packet (where the actual cue text is stored), but
does add the cue id and settings as a side data items, if
they're present in the cue. Existing code that cares only
about the data part of the packet can continue to ignore the
side data.

There are two new packet data type flags,
AV_PKT_DATA_WEBVTT_IDENTIFIER and
AV_PKT_DATA_WEBVTT_SETTINGS.

6 years agolavc/avpacket: fill padding area on side data split.
Clément Bœsch [Sat, 1 Jun 2013 12:07:24 +0000 (14:07 +0200)]
lavc/avpacket: fill padding area on side data split.

The padding data is assumed to be 0 in several places, notably in
subtitles. This problem was not detected with fate-sub-srt test because
the first element of the side data (x1) is 0 in the test, so the
trailing side data present in the packet wasn't read by the decoder. The
issue can be observed with a large enough x1.

It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG
bitstreams require that padding with 0, so it might fix other issues.

6 years agojpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is deallocated
Michael Niedermayer [Sat, 1 Jun 2013 12:33:34 +0000 (14:33 +0200)]
jpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is deallocated

This keeps the structure fields more consistent after cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agouse my full first name instead of short one in copyrights
Kostya Shishkov [Sat, 1 Jun 2013 08:38:56 +0000 (10:38 +0200)]
use my full first name instead of short one in copyrights

6 years agoffplay: detect when the created overlay buffers are not valid for the wanted overlay...
Marton Balint [Wed, 29 May 2013 21:21:14 +0000 (23:21 +0200)]
ffplay: detect when the created overlay buffers are not valid for the wanted overlay height

Fixes cases when the picture height was bigger than the maximum supported
overlay height...

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: do not allow wider window than 16383
Marton Balint [Wed, 29 May 2013 21:03:47 +0000 (23:03 +0200)]
ffplay: do not allow wider window than 16383

SDL surface pitch is 16bit, to avoid possible overflows, we limit the window
width to 16383. Fixes ticket #2428.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use 0 frame delay if redisplaying an already displayed frame
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: use 0 frame delay if redisplaying an already displayed frame

With the previous patches this finally fixes ticket #1707.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use more sane frame timer resetting logic
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: use more sane frame timer resetting logic

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: only update pts if not redisplaying a frame
Marton Balint [Sat, 25 May 2013 10:48:20 +0000 (12:48 +0200)]
ffplay: only update pts if not redisplaying a frame

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: fix compute_target_delay to better handle frames with long durations
Marton Balint [Sun, 17 Feb 2013 20:03:20 +0000 (21:03 +0100)]
ffplay: fix compute_target_delay to better handle frames with long durations

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: if playing only audio or video only, show the master clock diff in status...
Marton Balint [Sat, 11 May 2013 11:37:25 +0000 (13:37 +0200)]
ffplay: if playing only audio or video only, show the master clock diff in status line

Showing A-V diff has no use if there is no audio and video stream, but showing
the audio or video clock difference to the master clock can be useful.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: factorize clock functions
Marton Balint [Sat, 11 May 2013 10:53:28 +0000 (12:53 +0200)]
ffplay: factorize clock functions

There should be no change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: decrease video picture queue size to 3
Marton Balint [Sat, 16 Feb 2013 17:08:20 +0000 (18:08 +0100)]
ffplay: decrease video picture queue size to 3

It was raised to 4 because of a theoretical issue, if we ensure that we do not
return from the display function without popping one picture from the queue,
then its OK to use the old size.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolavfi/mptestsrc: fix chroma subsampling with odd sizes.
Clément Bœsch [Thu, 16 May 2013 16:58:35 +0000 (18:58 +0200)]
lavfi/mptestsrc: fix chroma subsampling with odd sizes.

This makes no difference in practice since w & h are hardcoded to 512.

6 years agolavfi/pixdesctest: fix chroma subsampling with odd sizes.
Clément Bœsch [Thu, 16 May 2013 16:54:28 +0000 (18:54 +0200)]
lavfi/pixdesctest: fix chroma subsampling with odd sizes.

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 1 Jun 2013 09:49:44 +0000 (11:49 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with --disable-everything --enable-encoder=jpeg2000

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: optimize dequantization_int()
Michael Niedermayer [Fri, 31 May 2013 13:39:22 +0000 (15:39 +0200)]
jpeg2000dec: optimize dequantization_int()

4400->2800 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: optimize dequantization_float()
Michael Niedermayer [Fri, 31 May 2013 13:36:49 +0000 (15:36 +0200)]
jpeg2000dec: optimize dequantization_float()

4700 -> 2700 cycles (sandybridge  i7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with --disable-everything --enable-encoder=jpeg2000
Carl Eugen Hoyos [Sat, 1 Jun 2013 09:15:31 +0000 (11:15 +0200)]
Fix compilation with --disable-everything --enable-encoder=jpeg2000

The JPEG2000 encoder depends on the discrete wavelet transform.

6 years agoavutil/crc: Dont limit CRC32 standard tables
James Almer [Sat, 1 Jun 2013 04:36:38 +0000 (01:36 -0300)]
avutil/crc: Dont limit CRC32 standard tables

Currently, standard tables like AV_CRC_32_IEEE and such are being generated (or
provided in case the user compiles with hardcoded tables) with only 257 elements.
We're missing a considerable boost in performance by not making them with a size
of 1024 elements instead.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 1 Jun 2013 08:27:41 +0000 (10:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: expand allowed quantiser range
  configure: icl: Merge -Qdiag-error parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'
Michael Niedermayer [Sat, 1 Jun 2013 08:16:42 +0000 (10:16 +0200)]
Merge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'

* commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28':
  configure: Separate commonalities in msvc and icl flags

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoindeo4: expand allowed quantiser range
Kostya Shishkov [Fri, 31 May 2013 19:09:27 +0000 (21:09 +0200)]
indeo4: expand allowed quantiser range

Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping
quantiser leads to incorrect quantisation and DC prediction on low-quality
videos.

This fixes bug 259.

6 years agolavf/allformats: align nit for tee muxer.
Clément Bœsch [Sat, 1 Jun 2013 00:35:42 +0000 (02:35 +0200)]
lavf/allformats: align nit for tee muxer.

6 years agotta: stop checking header checksum in extradata
Paul B Mahol [Fri, 31 May 2013 21:07:08 +0000 (21:07 +0000)]
tta: stop checking header checksum in extradata

It's redundant now as check in done in demuxer instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/tta: check header and seek table checksum
James Almer [Fri, 31 May 2013 20:27:53 +0000 (17:27 -0300)]
lavf/tta: check header and seek table checksum

Since we don't check for seek table integrity in the decoder anymore,
check it in the demuxer instead (Only tta files are guaranteed to have
one, and it should be valid there).

Check also for header integrity, since the check done in the decoder
is ignored because matroska doesn't store the header at all.

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoconfigure: icl: Merge -Qdiag-error parameters
Alex Smith [Thu, 30 May 2013 20:11:21 +0000 (20:11 +0000)]
configure: icl: Merge -Qdiag-error parameters

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoconfigure: Separate commonalities in msvc and icl flags
Alex Smith [Thu, 30 May 2013 20:11:20 +0000 (20:11 +0000)]
configure: Separate commonalities in msvc and icl flags

Allows for easier handling of flags that may be specific to icl or msvc.
Furthermore, simplify the handling of warnings and remarks thanks to
icl's support of -Wall on Windows.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 31 May 2013 16:37:22 +0000 (18:37 +0200)]
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>
6 years agoconfigure: check for nanosecond precission stat
Michael Niedermayer [Sat, 25 May 2013 13:32:14 +0000 (15:32 +0200)]
configure: check for nanosecond precission stat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_d2q: Add a special case for |value| > MAX and |value| < 1/MAX
Michael Niedermayer [Sat, 25 May 2013 13:39:02 +0000 (15:39 +0200)]
av_d2q: Add a special case for |value| > MAX and |value| < 1/MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoftp: enhanced error handling
Lukasz Marek [Fri, 31 May 2013 12:38:49 +0000 (14:38 +0200)]
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.

6 years agoftp: reconnect on seek
Lukasz Marek [Thu, 30 May 2013 01:17:23 +0000 (03:17 +0200)]
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)

6 years agoftp: move common commands code to function
Lukasz Marek [Wed, 29 May 2013 15:32:50 +0000 (17:32 +0200)]
ftp: move common commands code to function

Each send command routine requires the same steps.
This commit moves repeated code into one function.

6 years agoftp: enhanced status code handling
Lukasz Marek [Wed, 29 May 2013 14:00:14 +0000 (16:00 +0200)]
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.

6 years agoftp: reconnect on read
Lukasz Marek [Mon, 27 May 2013 18:53:27 +0000 (20:53 +0200)]
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.

6 years agoftp: move create control connection to function
Lukasz Marek [Thu, 30 May 2013 13:22:13 +0000 (15:22 +0200)]
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.

6 years agoftp: credentials moved into FTPContext
Lukasz Marek [Thu, 30 May 2013 02:11:21 +0000 (04:11 +0200)]
ftp: credentials moved into FTPContext

FTP server may disconnect client.

This commit stores credentials for future reconnect.

6 years agoftp: rename function name
Lukasz Marek [Thu, 30 May 2013 01:54:28 +0000 (03:54 +0200)]
ftp: rename function name

ftp_send_command was used only once.

This commit makes this function specific, not generic

6 years agoftp: formatting and typos fixes
Lukasz Marek [Thu, 30 May 2013 01:23:12 +0000 (03:23 +0200)]
ftp: formatting and typos fixes

6 years agojpeg2000dec: fix indention
Michael Niedermayer [Fri, 31 May 2013 11:33:13 +0000 (13:33 +0200)]
jpeg2000dec: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: print more detailed cdx/y debug info
Michael Niedermayer [Fri, 31 May 2013 11:32:33 +0000 (13:32 +0200)]
jpeg2000dec: print more detailed cdx/y debug info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 31 May 2013 09:32:53 +0000 (11:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresenc: alpha coding support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/vignette: remove extra semi-colon.
Clément Bœsch [Fri, 31 May 2013 08:22:03 +0000 (10:22 +0200)]
lavfi/vignette: remove extra semi-colon.

6 years agoj2k/jpeg2000dec: merge
Michael Niedermayer [Fri, 31 May 2013 00:12:22 +0000 (02:12 +0200)]
j2k/jpeg2000dec: merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k
Michael Niedermayer [Thu, 30 May 2013 23:53:13 +0000 (01:53 +0200)]
jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: merge sgnd fix from j2k
Michael Niedermayer [Thu, 30 May 2013 23:49:31 +0000 (01:49 +0200)]
jpeg2000dec: merge sgnd fix from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: merge struct field types from j2k
Michael Niedermayer [Thu, 30 May 2013 23:47:22 +0000 (01:47 +0200)]
jpeg2000dec: merge struct field types from j2k

Fixes AVOption type mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 23:46:07 +0000 (01:46 +0200)]
j2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge picture handling from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 23:32:36 +0000 (01:32 +0200)]
j2kdec: merge picture handling from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: restructure bitstream decoding
Michael Niedermayer [Thu, 30 May 2013 22:46:45 +0000 (00:46 +0200)]
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>
6 years agoj2k/jpeg2000: merge some of the tilepart related code
Michael Niedermayer [Thu, 30 May 2013 19:12:14 +0000 (21:12 +0200)]
j2k/jpeg2000: merge some of the tilepart related code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge length==0 check from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 19:01:34 +0000 (21:01 +0200)]
j2kdec: merge length==0 check from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000deci/j2kdec: fix sizeof types
Michael Niedermayer [Thu, 30 May 2013 18:54:52 +0000 (20:54 +0200)]
jpeg2000deci/j2kdec: fix sizeof types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: fix ff_mqc_initdec() and data setup order
Michael Niedermayer [Thu, 30 May 2013 17:54:59 +0000 (19:54 +0200)]
jpeg2000dec: fix ff_mqc_initdec() and data setup order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: simplify init_tile() / merge from j2k
Michael Niedermayer [Thu, 30 May 2013 17:46:39 +0000 (19:46 +0200)]
jpeg2000dec: simplify init_tile() / merge from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: fix cover art display on some software
Matthieu Bouron [Wed, 29 May 2013 10:05:26 +0000 (12:05 +0200)]
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

6 years agotta: remove pointless code
Paul B Mahol [Thu, 30 May 2013 19:57:47 +0000 (19:57 +0000)]
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.

6 years agolavfi/vignette: add aspect option.
Clément Bœsch [Thu, 30 May 2013 18:27:55 +0000 (20:27 +0200)]
lavfi/vignette: add aspect option.