]>
git.sesse.net Git - ffmpeg/log
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>
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>
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.
Stefano Sabatini [Tue, 28 May 2013 11:41:41 +0000 (13:41 +0200)]
tests: add mcdeint tests
Stefano Sabatini [Tue, 28 May 2013 11:40:39 +0000 (13:40 +0200)]
lavfi: port mcdeint filter from libmpcodecs
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
Clément Bœsch [Sat, 1 Jun 2013 17:16:37 +0000 (19:16 +0200)]
lavc/avcodec: decodimg → decoding.
Carl Eugen Hoyos [Sat, 1 Jun 2013 16:34:51 +0000 (18:34 +0200)]
Fix libcdio-paranoia detection.
Fixes ticket #2614.
Clément Bœsch [Sat, 1 Jun 2013 13:08:00 +0000 (15:08 +0200)]
lavf/webvttdec: factorize identifier and settings side data code.
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.
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
Clément Bœsch [Thu, 16 May 2013 16:54:28 +0000 (18:54 +0200)]
lavfi/pixdesctest: fix chroma subsampling with odd sizes.
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>
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>
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>
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.
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>
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>
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>
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.
Clément Bœsch [Sat, 1 Jun 2013 00:35:42 +0000 (02:35 +0200)]
lavf/allformats: align nit for tee muxer.
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>
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>
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>
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>
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>
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>
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>
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.
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)
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.
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.
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.
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.
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.
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
Lukasz Marek [Thu, 30 May 2013 01:23:12 +0000 (03:23 +0200)]
ftp: formatting and typos fixes
Michael Niedermayer [Fri, 31 May 2013 11:33:13 +0000 (13:33 +0200)]
jpeg2000dec: fix indention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
Clément Bœsch [Fri, 31 May 2013 08:22:03 +0000 (10:22 +0200)]
lavfi/vignette: remove extra semi-colon.
Michael Niedermayer [Fri, 31 May 2013 00:12:22 +0000 (02:12 +0200)]
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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.
Clément Bœsch [Thu, 30 May 2013 18:27:55 +0000 (20:27 +0200)]
lavfi/vignette: add aspect option.
Clément Bœsch [Thu, 30 May 2013 18:41:56 +0000 (20:41 +0200)]
lavfi/vignette: add some scaling debug.
Clément Bœsch [Thu, 30 May 2013 18:41:37 +0000 (20:41 +0200)]
lavfi/vignette: simplify dmax definition.
Clément Bœsch [Thu, 30 May 2013 18:40:39 +0000 (20:40 +0200)]
lavfi/vignette: fix scale with aspects smaller than one.
Michael Niedermayer [Thu, 30 May 2013 16:30:42 +0000 (18:30 +0200)]
h264_cavlc: fix reading skip run
Fixes Ticket2606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 15:14:19 +0000 (17:14 +0200)]
jpeg2000/j2k: merge non functional changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 15:03:07 +0000 (17:03 +0200)]
j2k:decode_tile() pass picture as argument
Reduce diff to jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 15:00:43 +0000 (17:00 +0200)]
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>
Michael Niedermayer [Thu, 30 May 2013 14:54:09 +0000 (16:54 +0200)]
j2kdec: s/j2k_/jpeg2000_/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 30 May 2013 16:13:04 +0000 (18:13 +0200)]
lavfi/vignette: make sure a sane sar is set.
Clément Bœsch [Tue, 2 Apr 2013 10:48:32 +0000 (12:48 +0200)]
lavfi: add vignette filter.
Michael Niedermayer [Thu, 30 May 2013 14:45:30 +0000 (16:45 +0200)]
j2k/jpeg2000: merge pix_fmt setting code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 14:07:07 +0000 (16:07 +0200)]
mpegvideo_enc: allow mpeg_quant to be set in mpeg2video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 12:40:58 +0000 (14:40 +0200)]
jpeg2000/j2k: merge j2k/jpeg2000.c/h
Now only j2kdec / jpeg2000dec.c remain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 12:35:34 +0000 (14:35 +0200)]
jpeg2000: remove unneeded casts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 12:34:33 +0000 (14:34 +0200)]
jpeg2000: merges quantization fixes from j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 12:32:45 +0000 (14:32 +0200)]
jpeg2000: remove unneeded variable initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 12:27:03 +0000 (14:27 +0200)]
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>
Michael Niedermayer [Thu, 30 May 2013 12:11:03 +0000 (14:11 +0200)]
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>
Carl Eugen Hoyos [Thu, 30 May 2013 11:13:57 +0000 (13:13 +0200)]
Use -lX11 -lXext when linking Xv output device.
Reviewed-by: Stefano Sabatini
Michael Niedermayer [Thu, 30 May 2013 09:14:10 +0000 (11:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Include hpeldsp_neon.o if h264qpel is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 09:02:14 +0000 (11:02 +0200)]
Merge commit '
efb7968cfe8b285ab4f27b363719b7c92d19ec74 '
* commit '
efb7968cfe8b285ab4f27b363719b7c92d19ec74 ':
arm: Don't unconditionally build dsputil files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 08:57:09 +0000 (10:57 +0200)]
Merge commit '
36a7df8cf1115aa37a1b0d42324ecde5ab6c2304 '
* commit '
36a7df8cf1115aa37a1b0d42324ecde5ab6c2304 ':
arm: Only build the FFT init files if FFT is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 08:45:47 +0000 (10:45 +0200)]
Merge commit '
186599ffe0a94d587434e5e46e190e038357ed99 '
* commit '
186599ffe0a94d587434e5e46e190e038357ed99 ':
build: cosmetics: Place unconditional before conditional OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 28 May 2013 17:00:21 +0000 (19:00 +0200)]
doc/encoders: remove duplicated "the"
Stefano Sabatini [Tue, 14 May 2013 11:44:29 +0000 (13:44 +0200)]
lavd: add xv output device
Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>.
See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000
Michael Niedermayer [Thu, 30 May 2013 08:37:32 +0000 (10:37 +0200)]
Merge commit '
9b9b2e9f3036abfd42916bcf734af14b4cb686aa '
* commit '
9b9b2e9f3036abfd42916bcf734af14b4cb686aa ':
build: arm: cosmetics: Place all OBJS declarations in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 08:23:50 +0000 (10:23 +0200)]
Merge commit '
701966730ce10290fd49c5ccedd73f505680f764 '
* commit '
701966730ce10290fd49c5ccedd73f505680f764 ':
vmd: drop incomplete chunks and spurious samples
Conflicts:
libavcodec/vmdav.c
2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 07:44:57 +0000 (09:44 +0200)]
Merge commit '
676da248cad49debc40720baa13214f0b94dcc71 '
* commit '
676da248cad49debc40720baa13214f0b94dcc71 ':
vmd: refactor the inner decode loop
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 07:37:14 +0000 (09:37 +0200)]
Merge commit '
c8f3cb9119c2183680d44a509a1b5a9817a3bee9 '
* commit '
c8f3cb9119c2183680d44a509a1b5a9817a3bee9 ':
vmd: return meaningful errors
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 07:28:03 +0000 (09:28 +0200)]
Merge commit '
91a6944e56236234f0a7ba162404665753cbcb51 '
* commit '
91a6944e56236234f0a7ba162404665753cbcb51 ':
vmd: use the PALETTE_COUNT constant uniformly
Conflicts:
libavcodec/vmdav.c
No change as the changed line does not exist in ffmpegs vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sat, 18 May 2013 10:07:30 +0000 (12:07 +0200)]
proresenc: alpha coding support
Michael Niedermayer [Thu, 30 May 2013 01:31:04 +0000 (03:31 +0200)]
fate: fix smvjpeg test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 May 2013 01:30:01 +0000 (03:30 +0200)]
libavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>