]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 14 Feb 2014 03:06:57 +0000 (04:06 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12dec: do not add stereo3D side data to a non-existing frame
Conflicts:
libavcodec/mpeg12dec.c
See:
fe285b04bbad23ddfac164e22034b5ee76e039a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Feb 2014 01:35:36 +0000 (02:35 +0100)]
Merge commit '
d261719319a505e1716e8b52fc955bef0503ff96 '
* commit '
d261719319a505e1716e8b52fc955bef0503ff96 ':
configure: do not link libraries against program-specific dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Feb 2014 01:06:41 +0000 (02:06 +0100)]
Merge commit '
60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8 '
* commit '
60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8 ':
configure: avserver does not need $ldl
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Feb 2014 00:47:06 +0000 (01:47 +0100)]
Merge commit '
8a2250344b19a343d830a902dbcf4c0b929ea49b '
* commit '
8a2250344b19a343d830a902dbcf4c0b929ea49b ':
jv: detect partial packets in the demuxer
Conflicts:
libavformat/jvdec.c
See:
9d0c71e5e34dec2c6246bf47da8d9674c92f85c1
See:
b948ab8132e24d215072120e210139dc456d4997
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Feb 2014 00:24:20 +0000 (01:24 +0100)]
Merge commit '
f795a8a8bf5e312dad2c2829c543b9d309376ca1 '
* commit '
f795a8a8bf5e312dad2c2829c543b9d309376ca1 ':
h264: make context_count unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Feb 2014 23:02:27 +0000 (00:02 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/opengl_enc: implement uncoded frame callback
lavd/opengl_enc: add gray8/16 formats
Merged-by: Michael Niedermayer <michaelni@gmx.at>
mrlika [Mon, 3 Feb 2014 12:11:07 +0000 (14:11 +0200)]
avformat/mpegts: DVB subtitles multiple languages support
Copy multiple languages data from PMT to extradata. New 5 bytes
per language extradata format.
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 4 Feb 2014 23:30:38 +0000 (00:30 +0100)]
lavd/opengl_enc: implement uncoded frame callback
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 8 Feb 2014 02:39:34 +0000 (03:39 +0100)]
lavd/opengl_enc: add gray8/16 formats
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Derek Buitenhuis [Thu, 13 Feb 2014 22:22:56 +0000 (22:22 +0000)]
MAINTANERS: Add myself as libx265 maintainer
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:24 +0000 (20:49 +0000)]
libx265: Remove redundant default param call
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:05 +0000 (20:49 +0000)]
libx265: Fix use of uninitialized input picture
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
James Almer [Sat, 8 Feb 2014 05:54:51 +0000 (02:54 -0300)]
flac/x86: add ff_flac_lpc_32_xop()
Tested on an AMD FX 6300
679081 decicycles in ff_flac_lpc_32_xop, 32768 runs
774425 decicycles in ff_flac_lpc_32_sse4, 32768 runs
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 8 Feb 2014 05:54:50 +0000 (02:54 -0300)]
x86inc: Extend FMA_INSTR functionality
Support the cases where the first and last operand of
the XOP instruction are the same.
Also add vpmacsdql emulation.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Tue, 11 Feb 2014 22:49:39 +0000 (23:49 +0100)]
lavc: fix flac encoder and decoder dependencies
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 13 Feb 2014 13:34:58 +0000 (14:34 +0100)]
avfilter/curves: support slice threading.
Michael Niedermayer [Thu, 13 Feb 2014 12:59:51 +0000 (13:59 +0100)]
avformat/mpegtsenc: Check data array size in mpegts_write_pmt()
Prevents out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mrlika [Thu, 13 Feb 2014 00:00:24 +0000 (02:00 +0200)]
mpegts muxer: DVB subtitles multiple languages support
* restore multiple languages data from extradata to PMT table
* setting correctly hearing empaired subtitling type
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 13 Feb 2014 12:37:32 +0000 (13:37 +0100)]
avfilter/lut3d: support slice threading.
Janne Grunau [Thu, 13 Feb 2014 09:39:08 +0000 (10:39 +0100)]
mpeg12dec: do not add stereo3D side data to a non-existing frame
User data is usually coded before slice data. That means the frame
the user data belongs to is not available while parsing the user data.
The stereo3D side data has to use the same indirection over the private
context as pan scan information and A53 captions.
Bug-Id:632
Janne Grunau [Wed, 12 Feb 2014 23:44:08 +0000 (00:44 +0100)]
configure: do not link libraries against program-specific dependencies
Bug-Id: 635
Michael Niedermayer [Thu, 13 Feb 2014 01:20:08 +0000 (02:20 +0100)]
avcodec/arm/int_neon: fix handling sizes % 16 != 0
This assumes the array is sufficiently padded with 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 12 Feb 2014 17:03:07 +0000 (14:03 -0300)]
tta: split off hybrid filter processing as ttadsp
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 12 Feb 2014 20:16:16 +0000 (21:16 +0100)]
tools/uncoded_frame: fix double free
in case av_interleaved_write_uncoded_frame fails it seems
frame is freed for the second time in fail section.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
This commit also removes 1 trailing whitespace as otherwise the push hook rejects it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 23:41:06 +0000 (00:41 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp9: add a new segmentation sample.
Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-segmentation-aq-akiyo
tests/ref/fate/vp9-segmentation-sf-akiyo
See:
65f41b5c5cdb22e60a83321fe564ebb0155a35ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 23:32:00 +0000 (00:32 +0100)]
Merge commit '
91be8df20b57a18307e90f1c4886a35ea7b28880 '
* commit '
91be8df20b57a18307e90f1c4886a35ea7b28880 ':
vp9: add fate sample for parallelmode.
Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-parallelmode-akiyo
See:
1d6bb21348711a05f25123b9aad065a08e1e5b58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 12 Feb 2014 23:29:14 +0000 (00:29 +0100)]
configure: avserver does not need $ldl
Loadable plugins were removed in
d010e95f86089abe9a3d4d4a66ac8102312d28a4 .
Michael Niedermayer [Wed, 12 Feb 2014 23:12:03 +0000 (00:12 +0100)]
Merge commit '
50ea93158d4c480f64069e8bd1da388486dcf4ba '
* commit '
50ea93158d4c480f64069e8bd1da388486dcf4ba ':
Add libx265 encoder
Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h
See:
bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 12 Feb 2014 19:08:52 +0000 (20:08 +0100)]
jv: detect partial packets in the demuxer
Fixes fate-jv under valgrind which reports a different CRC for the last
frame from a partial read.
Michael Niedermayer [Wed, 12 Feb 2014 16:10:26 +0000 (17:10 +0100)]
avformat/asfdec: pass on error code from avio_seek()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 15:36:04 +0000 (16:36 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: fix seeking with fragmented packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)]
Merge commit '
0c082565965258dca143767cc6cb25e38b6e9ea3 '
* commit '
0c082565965258dca143767cc6cb25e38b6e9ea3 ':
asfdec: short-circuit seeking to the start of stream
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 15:00:37 +0000 (16:00 +0100)]
Merge commit '
0ebb523f072322972ea446616676fff32e9603c6 '
* commit '
0ebb523f072322972ea446616676fff32e9603c6 ':
asfdec: check ff_get_guid() return values during seeking
Conflicts:
libavformat/asfdec.c
The code that pretends that a truncated index is correct and complete is not merged
as it obviously would cause problems if a really truncated index is encountered
If someone has samples that work better with that hack, please share them / mail me
also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 14:51:38 +0000 (15:51 +0100)]
avformat/riff: return error code from ff_get_guid()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 12 Feb 2014 11:47:27 +0000 (12:47 +0100)]
h264: make context_count unsigned
Removes the bogus but scary looking warning 'libavcodec/h264.c:4529:49:
warning: array subscript is below array bounds [-Warray-bounds]'.
Ronald S. Bultje [Thu, 6 Feb 2014 22:52:18 +0000 (23:52 +0100)]
vp9: add a new segmentation sample.
The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Ronald S. Bultje [Thu, 6 Feb 2014 22:52:17 +0000 (23:52 +0100)]
vp9: add fate sample for parallelmode.
This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 12 Feb 2014 13:59:00 +0000 (14:59 +0100)]
Merge commit '
462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6 '
* commit '
462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6 ':
aacdec: set AVFrame sample_rate
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 13:49:13 +0000 (14:49 +0100)]
Merge commit '
4a7d3837b4dd17fff270b55166597c093204e542 '
* commit '
4a7d3837b4dd17fff270b55166597c093204e542 ':
buffersrc: Have function parameter names match between .c and .h file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Feb 2014 13:41:24 +0000 (14:41 +0100)]
Merge commit '
25a1ba814ad80056247fd357ec4c6911324a3f66 '
* commit '
25a1ba814ad80056247fd357ec4c6911324a3f66 ':
log: Have function parameter names match between .c and .h file
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:26 +0000 (14:46 +0000)]
Add libx265 encoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:26 +0000 (14:46 +0000)]
Add libx265 encoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Janne Grunau [Tue, 11 Feb 2014 12:01:38 +0000 (13:01 +0100)]
asfdec: fix seeking with fragmented packets
After seeking fragments with an offset > 0 must be skipped to correctly
assemble packets.
Bug-Id: 43
Andrew Kelley [Sun, 2 Feb 2014 23:05:58 +0000 (23:05 +0000)]
asfdec: short-circuit seeking to the start of stream
Bug-id: 43
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Tue, 11 Feb 2014 14:13:31 +0000 (15:13 +0100)]
asfdec: check ff_get_guid() return values during seeking
Hitting EOF during seeking is quite likely. Fixes use of uninitialized
data during fate-seek-lavf-asf.
John Stebbins [Sun, 9 Feb 2014 01:19:30 +0000 (01:19 +0000)]
aacdec: set AVFrame sample_rate
AVFrame.sample_rate is set in ff_get_buffer, but aacdec calls
ff_get_buffer before the samplerate is known. So it needs to be
set again before returning the frame.
Diego Biurrun [Tue, 11 Feb 2014 21:15:07 +0000 (22:15 +0100)]
buffersrc: Have function parameter names match between .c and .h file
This fixes two related Doxygen warnings. Also document one parameter.
Diego Biurrun [Tue, 11 Feb 2014 21:15:06 +0000 (22:15 +0100)]
log: Have function parameter names match between .c and .h file
This fixes two related Doxygen warnings.
Clément Bœsch [Wed, 12 Feb 2014 09:12:46 +0000 (10:12 +0100)]
avfilter/lut3d: inline whole loop in interpolation function.
84 → 92 fps here.
Michael Niedermayer [Wed, 12 Feb 2014 05:32:51 +0000 (06:32 +0100)]
avformat/mov: fix keyframe flags for sample from chromium Issue 340865
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 23:37:51 +0000 (00:37 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/lavd: version bump and APIchanges for uncoded frames.
tools: add uncoded_frame test program.
lavf: add uncodedframecrc test muxer.
lavd/xv: preliminary support of uncoded frame.
lavd/alsa: preliminary support of uncoded frame.
lavf: add write_uncoded_frame() API.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 23:11:16 +0000 (00:11 +0100)]
avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong
Fixes mp1/mp3 in mp4 misdetection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 22:58:39 +0000 (23:58 +0100)]
avcodec/mpegaudio_parser: treat codec_id like the other parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 22:57:47 +0000 (23:57 +0100)]
avcodec: Add avpriv_mpa_decode_header2()
The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 22:20:09 +0000 (23:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 22:04:15 +0000 (23:04 +0100)]
Merge commit '
6477449243db4aab15a4db356e8354c60b5366ec '
* commit '
6477449243db4aab15a4db356e8354c60b5366ec ':
g2meet: make JPEG tile decoder operate on 8x8 block mask
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Feb 2014 21:37:35 +0000 (22:37 +0100)]
Merge commit '
d6d78518018a12fb495baab5663708a830f3aab6 '
* commit '
d6d78518018a12fb495baab5663708a830f3aab6 ':
g2meet: factor out seeking to the chunk end
Conflicts:
libavcodec/g2meet.c
See:
3f826039ddccdd7840cdf982a1a61cb11121a5a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Mon, 10 Feb 2014 15:53:20 +0000 (08:53 -0700)]
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kostya Shishkov [Sat, 8 Feb 2014 12:39:32 +0000 (13:39 +0100)]
g2meet: make JPEG tile decoder operate on 8x8 block mask
This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
Maxim Poliakovski [Mon, 21 Oct 2013 22:54:51 +0000 (00:54 +0200)]
g2meet: factor out seeking to the chunk end
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Nicolas George [Tue, 11 Feb 2014 09:34:32 +0000 (10:34 +0100)]
lavf/lavd: version bump and APIchanges for uncoded frames.
Nicolas George [Mon, 3 Feb 2014 08:12:27 +0000 (09:12 +0100)]
tools: add uncoded_frame test program.
Nicolas George [Wed, 15 Jan 2014 22:08:43 +0000 (23:08 +0100)]
lavf: add uncodedframecrc test muxer.
Nicolas George [Wed, 1 Jan 2014 11:05:48 +0000 (12:05 +0100)]
lavd/xv: preliminary support of uncoded frame.
Nicolas George [Tue, 31 Dec 2013 13:09:15 +0000 (14:09 +0100)]
lavd/alsa: preliminary support of uncoded frame.
Nicolas George [Tue, 31 Dec 2013 13:09:48 +0000 (14:09 +0100)]
lavf: add write_uncoded_frame() API.
James Almer [Thu, 6 Feb 2014 04:33:59 +0000 (01:33 -0300)]
x86: add missing XOP checks and macros
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Wed, 5 Feb 2014 00:24:19 +0000 (01:24 +0100)]
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Tue, 4 Feb 2014 23:43:38 +0000 (10:43 +1100)]
avformat/libssh: Fix libssh defaulting to shared linkage.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 20:52:45 +0000 (21:52 +0100)]
avcodec/ra144: remove redundant AV_ZERO128
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 4 Mar 2012 12:28:16 +0000 (13:28 +0100)]
ra144: use scalarproduct_int16
The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 20:02:35 +0000 (21:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rpza: limit the number of blocks to the total remaining blocks in the frame
See:
3819db745da2ac7fb3faacb116788c32f4753f34
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 19:45:40 +0000 (20:45 +0100)]
Merge commit '
a46dc49744bdc4f2e31725b63ac8e41f701e4fa1 '
* commit '
a46dc49744bdc4f2e31725b63ac8e41f701e4fa1 ':
rpza: move some variables to the blocks where they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 19:40:31 +0000 (20:40 +0100)]
Merge commit '
c7769df178fd670156f1c11f6c8410ddd59bbfee '
* commit '
c7769df178fd670156f1c11f6c8410ddd59bbfee ':
rpza: use fixed-width int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 19:31:56 +0000 (20:31 +0100)]
Merge commit '
e1218ce9149aad0ae9770a32a78d77ad2210bd64 '
* commit '
e1218ce9149aad0ae9770a32a78d77ad2210bd64 ':
rpza: switch to bytestream2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 19:23:12 +0000 (20:23 +0100)]
ffmpeg: fix vstats
Broken by:
394fb56c29eee7f4f8f0334d8b5d30d3c54ac703
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 18:57:23 +0000 (19:57 +0100)]
Merge commit '
394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 '
* commit '
394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 ':
lavf: always unref the packet passed to av_interleaved_write_frame() on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 18:10:12 +0000 (19:10 +0100)]
doc/APIchanges: fill in FFmpeg hashes & versions
Entries that have no hash at all are not filled in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Zhang Rui [Sat, 8 Feb 2014 04:17:42 +0000 (12:17 +0800)]
avformat/concatdec: pass the interrupt callback on
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
rpza: limit the number of blocks to the total remaining blocks in the frame
Fixes invalid writes.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Wed, 8 Jan 2014 13:03:23 +0000 (14:03 +0100)]
rpza: move some variables to the blocks where they are used
Anton Khirnov [Wed, 8 Jan 2014 13:00:13 +0000 (14:00 +0100)]
rpza: use fixed-width int types
Anton Khirnov [Wed, 8 Jan 2014 12:58:38 +0000 (13:58 +0100)]
rpza: switch to bytestream2
Anton Khirnov [Tue, 4 Feb 2014 14:58:11 +0000 (15:58 +0100)]
lavf: always unref the packet passed to av_interleaved_write_frame() on error
Michael Niedermayer [Mon, 10 Feb 2014 13:20:43 +0000 (14:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix examples compilation when EXESUF is not empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 13:09:56 +0000 (14:09 +0100)]
Merge commit '
18c896be3d8e926ef806e7de29c4a168d7763389 '
* commit '
18c896be3d8e926ef806e7de29c4a168d7763389 ':
lavf: extend / improve the AVFormatContext doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 12:52:19 +0000 (13:52 +0100)]
Merge commit '
54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2 '
* commit '
54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2 ':
lavf: add some basic documentation of the muxing process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 12:47:01 +0000 (13:47 +0100)]
Merge commit '
4c750599509c3973afbe2850953a1fb963f696e5 '
* commit '
4c750599509c3973afbe2850953a1fb963f696e5 ':
lavf: rewrite the av_write_frame() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 12:32:18 +0000 (13:32 +0100)]
Merge commit '
ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b '
* commit '
ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b ':
lavf: rewrite the av_interleaved_write_frame() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 12:09:13 +0000 (13:09 +0100)]
Merge commit '
b36bc81ccaa2fc85dc4bae7dc546c71e8833573d '
* commit '
b36bc81ccaa2fc85dc4bae7dc546c71e8833573d ':
avplay: add support for seeking to chapter marks
Conflicts:
doc/ffplay.texi
ffplay.c
ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 9 Feb 2014 23:23:28 +0000 (00:23 +0100)]
build: fix examples compilation when EXESUF is not empty
Due to a wrong substitution doc/examples is not added as a prerequisite
for the objects of the example programs. This results in compiler error
due to the non-existing output directory.
Bug-Id: 636
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Marton Balint [Tue, 4 Feb 2014 22:59:47 +0000 (23:59 +0100)]
lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams
Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.
Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 11:53:31 +0000 (12:53 +0100)]
Merge commit '
f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0 '
* commit '
f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0 ':
hevc: update conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 11:39:55 +0000 (12:39 +0100)]
Merge commit '
b5f851ed7e59f88b4130a420033d9fe191ec9e2f '
* commit '
b5f851ed7e59f88b4130a420033d9fe191ec9e2f ':
FATE: force FLAC in the lavf ogg test
Conflicts:
tests/lavf-regression.sh
See:
28caf13ac394df5424a25304bda4608441bd85ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 11:36:32 +0000 (12:36 +0100)]
Merge commit '
38893dc028e458eaf3f906833d4ee515689edb7e '
* commit '
38893dc028e458eaf3f906833d4ee515689edb7e ':
pcmdec: replace a reachable assert with an error check
Conflicts:
libavformat/pcmdec.c
No assert removed as there was none in FFmpeg in the equivalent function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 11:29:05 +0000 (12:29 +0100)]
Merge commit '
cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d '
* commit '
cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d ':
doc/APIchanges: mark the place where 9 was branched
Conflicts:
doc/APIchanges
Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 11:17:35 +0000 (12:17 +0100)]
Merge commit '
d711d839ca6714a5ef5b53ee51bc7632e62cf203 '
* commit '
d711d839ca6714a5ef5b53ee51bc7632e62cf203 ':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 4 Feb 2014 17:11:40 +0000 (18:11 +0100)]
lavf: extend / improve the AVFormatContext doxy
Anton Khirnov [Tue, 4 Feb 2014 16:35:18 +0000 (17:35 +0100)]
lavf: add some basic documentation of the muxing process
Anton Khirnov [Tue, 4 Feb 2014 14:46:51 +0000 (15:46 +0100)]
lavf: rewrite the av_write_frame() doxy
Remove some vague / incorrect statements and make the text more specific
and less confusing.