OSDN Git Service
Michael Niedermayer [Fri, 28 Feb 2014 02:31:07 +0000 (03:31 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
lavfi/frei0r: factorize plugin loading with static path
lavfi/frei0r: search plugins in lib64 dirs on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Feb 2014 01:14:17 +0000 (02:14 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: fix seek to nagative position
lavf/libssh: fix seek to nagative position
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Feb 2014 01:06:34 +0000 (02:06 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Give IDCT matrix transpose macro a more descriptive name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Thu, 27 Feb 2014 23:07:31 +0000 (00:07 +0100)]
lavf/ftp: fix seek to nagative position
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Thu, 27 Feb 2014 23:04:29 +0000 (00:04 +0100)]
lavf/libssh: fix seek to nagative position
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
James Almer [Thu, 27 Feb 2014 17:40:28 +0000 (14:40 -0300)]
x86/imdct36: use sse3 instructions in the last BUTTERF step when possible
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 27 Feb 2014 05:07:58 +0000 (02:07 -0300)]
x86/imdct36: don't build imdct36_float_sse on x86_64 targets
There's an SSE2 version as well, and x86_64 guarantees that
instruction set is present.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 18 Feb 2014 17:57:45 +0000 (09:57 -0800)]
Give IDCT matrix transpose macro a more descriptive name
This also avoids a macro name clash and related warning on ARM.
Michael Niedermayer [Thu, 27 Feb 2014 20:55:31 +0000 (21:55 +0100)]
avcodec/mjpegdec: convert CMYK to GBRAP
Fixes Ticket2799
This should be moved into swscale once we have a CMYK pixel format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 20:49:46 +0000 (21:49 +0100)]
avcodec/mjpegdec: fix decoding 4th plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 19:02:40 +0000 (20:02 +0100)]
avcodec/mjpegdec: Print error in case of CMYK
Also fail if AV_EF_EXPLODE is set.
We do not fail by default, but rather return some image as it may be usefull to the
end user to see what is on the image, for example text could be read quite fine and
objects recognized.
Possibly fixes Ticket3424
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 19:02:20 +0000 (20:02 +0100)]
avcodec/mjpegdec: parse adobe_transform
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 18:35:37 +0000 (19:35 +0100)]
avcodec/mjpegdec: Print human readable string for APPx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 26 Feb 2014 08:51:06 +0000 (09:51 +0100)]
Fix http authentication.
Add parenthesis around "MD5" in the request string as required by
RFC 2069.
Fixes ticket #3417.
Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie
Michael Niedermayer [Thu, 27 Feb 2014 14:49:25 +0000 (15:49 +0100)]
avcodec/h264: allow mixing idr and non idr slices with frame threading again
This combination exists in the wild
Fixes Ticket3131
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 12:52:55 +0000 (13:52 +0100)]
avformat/mov: simplify code setting needs_parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 10:16:23 +0000 (11:16 +0100)]
avcodec/h264_refs: remove lost frames instead of disfavoring them
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 09:34:31 +0000 (10:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_compand: add a dependency on strtok_r
Conflicts:
configure
Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 02:57:39 +0000 (03:57 +0100)]
avcodec/h264: fix droped frame handling also for threads > 1
Seems i mistakely tested just with threads=1
Fixes part of Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Feb 2014 02:21:07 +0000 (03:21 +0100)]
avcodec/h264: avoid using lost frames as references
Fixes Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 22 Feb 2014 16:46:25 +0000 (17:46 +0100)]
lavfi/frei0r: factorize plugin loading with static path
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 22 Feb 2014 16:42:20 +0000 (17:42 +0100)]
lavfi/frei0r: search plugins in lib64 dirs on all architectures
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Wed, 26 Feb 2014 21:02:19 +0000 (22:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 26 Feb 2014 12:44:53 +0000 (13:44 +0100)]
af_compand: add a dependency on strtok_r
Diego Biurrun [Wed, 19 Feb 2014 19:33:29 +0000 (20:33 +0100)]
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
These are already covered through dependencies specified in configure.
Peter Ross [Wed, 26 Feb 2014 10:03:52 +0000 (21:03 +1100)]
libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 24 Feb 2014 00:39:18 +0000 (16:39 -0800)]
configure: use pkg-config to detect libbluray
The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 16:29:18 +0000 (17:29 +0100)]
avcodec/parser: put lost comments back
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 26 Feb 2014 17:46:45 +0000 (17:46 +0000)]
avformat/sdr2: h264 stream needs parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 26 Feb 2014 16:34:58 +0000 (16:34 +0000)]
avfilter: remove superflous lines
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 26 Feb 2014 15:03:09 +0000 (15:03 +0000)]
avfilter/af_compand: some more cosmetics to decrease difference with qatar
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 26 Feb 2014 12:13:50 +0000 (13:13 +0100)]
avfilter: remove af_compand_fork
All relevant changes except the float/double one have been merged
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 12:09:30 +0000 (13:09 +0100)]
avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:59:31 +0000 (12:59 +0100)]
avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:53:37 +0000 (12:53 +0100)]
avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:50:54 +0000 (12:50 +0100)]
avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:49:04 +0000 (12:49 +0100)]
avfilter/af_compand: error checks from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:44:01 +0000 (12:44 +0100)]
avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:42:47 +0000 (12:42 +0100)]
avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:40:33 +0000 (12:40 +0100)]
avfilter/af_compand: add Andrew Kelley to the copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:29:22 +0000 (12:29 +0100)]
avfilter/af_compand: merge avframe code from af_compand_fork
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:11:33 +0000 (12:11 +0100)]
avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 11:04:00 +0000 (12:04 +0100)]
avfilter/af_compand: also support '|' as seperator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 10:44:42 +0000 (11:44 +0100)]
avfilter/af_compand_fork: avoid strtok_r() so as not to break build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 10:41:36 +0000 (11:41 +0100)]
avfilter/af_compand: whitespace changes from af_compand_fork
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Feb 2014 10:18:16 +0000 (11:18 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See:
6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Kelley [Wed, 26 Feb 2014 06:47:40 +0000 (01:47 -0500)]
lavfi: add compand audio filter
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Carl Eugen Hoyos [Tue, 25 Feb 2014 23:02:51 +0000 (00:02 +0100)]
Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.
Fixes ticket #3425.
Michael Niedermayer [Tue, 25 Feb 2014 19:52:37 +0000 (20:52 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
parser: cosmetics: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Feb 2014 18:24:16 +0000 (19:24 +0100)]
Merge commit '
e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
* commit '
e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
libavfilter: example audio filtering program
Conflicts:
.gitignore
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Kelley [Tue, 25 Feb 2014 09:37:26 +0000 (04:37 -0500)]
avfilter/af_compand: fix invalid read
Fixes #3383.
Michael Niedermayer [Tue, 25 Feb 2014 18:12:30 +0000 (19:12 +0100)]
Merge commit '
a1c699659d56b76c0bf399307f642c6fd6d28281'
* commit '
a1c699659d56b76c0bf399307f642c6fd6d28281':
parser: K&R formatting cosmetics
Conflicts:
libavcodec/parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Feb 2014 18:03:29 +0000 (19:03 +0100)]
Merge commit '
ed61f3ca8a0664a697782253b354055136c5d303'
* commit '
ed61f3ca8a0664a697782253b354055136c5d303':
parser: Remove commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:28 +0000 (11:47 +0100)]
mpegvideo: re-indent buffer clearing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:27 +0000 (11:47 +0100)]
mpegvideo: fix overwriting hwaccel surface objects
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 25 Feb 2014 11:21:15 +0000 (12:21 +0100)]
parser: cosmetics: Drop some unnecessary parentheses
Anton Khirnov [Thu, 13 Feb 2014 07:50:16 +0000 (08:50 +0100)]
libavfilter: example audio filtering program
Based on a patch by Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Peter Ross [Tue, 25 Feb 2014 10:02:56 +0000 (21:02 +1100)]
avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 23 Feb 2014 22:59:25 +0000 (23:59 +0100)]
parser: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Tue, 25 Feb 2014 10:59:05 +0000 (11:59 +0100)]
parser: Remove commented-out cruft
Michael Niedermayer [Tue, 25 Feb 2014 08:02:57 +0000 (09:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
texi2pod: always declare the pod file as UTF-8 encoded
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 23 Feb 2014 22:19:23 +0000 (23:19 +0100)]
lavu/buffer: add release function
new function allows to unref buffer and obtain its data.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 24 Feb 2014 02:19:55 +0000 (02:19 +0000)]
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
avio_open2() only return < 0 when error.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 24 Feb 2014 19:22:13 +0000 (20:22 +0100)]
texi2pod: always declare the pod file as UTF-8 encoded
Michael Niedermayer [Mon, 24 Feb 2014 21:29:06 +0000 (22:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 21:19:41 +0000 (22:19 +0100)]
Merge commit '
48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
* commit '
48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 21:13:42 +0000 (22:13 +0100)]
Merge commit '
39c2880eeae6930b1036ce1f479afc1e1152c13f'
* commit '
39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:44:52 +0000 (21:44 +0100)]
Merge commit '
dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
* commit '
dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)]
Merge commit '
67f2a688143b644f99360565a9f36c61a5f052e9'
* commit '
67f2a688143b644f99360565a9f36c61a5f052e9':
avconv: remove a write-only variable
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:05:09 +0000 (21:05 +0100)]
Merge commit '
8aca00cc2b25810bdd85b75f5632844a5614b707'
* commit '
8aca00cc2b25810bdd85b75f5632844a5614b707':
libx265: Properly handled dynamic linking with MSVC
See:
87769d6c8f6d71e4814821f7e6f57b4b65eaf2a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:03:25 +0000 (21:03 +0100)]
Michael Niedermayer [Mon, 24 Feb 2014 20:02:06 +0000 (21:02 +0100)]
Michael Niedermayer [Mon, 24 Feb 2014 19:40:52 +0000 (20:40 +0100)]
Merge commit '
d00a504b244e136a0c82a55e21ed94659e0674ad'
* commit '
d00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See:
d3736471948cd06851f6b3aef352ef285b7c6480
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:44:37 +0000 (22:44 +0100)]
avformat/options_table: add named constants for avoid_negative_ts
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 24 Feb 2014 16:03:03 +0000 (17:03 +0100)]
doc: fix one accented word
Vittorio Giovara [Mon, 24 Feb 2014 15:59:40 +0000 (16:59 +0100)]
doc: name correct header
Anton Khirnov [Wed, 19 Feb 2014 19:55:27 +0000 (20:55 +0100)]
af_volume: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 19:42:39 +0000 (20:42 +0100)]
af_resample: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 15:16:43 +0000 (16:16 +0100)]
avconv: remove a write-only variable
Derek Buitenhuis [Fri, 21 Feb 2014 17:13:56 +0000 (12:13 -0500)]
libx265: Use proper error code
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 24 Feb 2014 09:47:47 +0000 (10:47 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 09:15:16 +0000 (10:15 +0100)]
Merge commit '
8feac29cc46270cc89d6016340e7bac780877131'
* commit '
8feac29cc46270cc89d6016340e7bac780877131':
lavc: use AVFrame API properly in ff_reget_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 08:52:13 +0000 (09:52 +0100)]
avutil/frame_copy_audio: also check that channels match
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 08:37:14 +0000 (09:37 +0100)]
Merge commit '
1155fd02ae7bac215acab316e847c6bb25f74fc3'
* commit '
1155fd02ae7bac215acab316e847c6bb25f74fc3':
frame: add a convenience function for copying AVFrame data
Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 07:53:13 +0000 (08:53 +0100)]
Merge commit '
746dca483a2f0f2639265f6e1c0085c8861875a1'
* commit '
746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See:
6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 24 Feb 2014 05:34:38 +0000 (02:34 -0300)]
x86: Move XOP emulation to x86util
We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:29:51 +0000 (22:29 +0100)]
swr: check that the context for swr_convert() has been initialized
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:28:24 +0000 (22:28 +0100)]
swresample: add swr_is_initialized()
Idea-from/based-on:
7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 11 Feb 2014 14:08:12 +0000 (15:08 +0100)]
Use av_frame_copy() to simplify code where appropriate.
Anton Khirnov [Tue, 11 Feb 2014 13:59:00 +0000 (14:59 +0100)]
lavc: use AVFrame API properly in ff_reget_buffer()
Anton Khirnov [Tue, 11 Feb 2014 13:15:20 +0000 (14:15 +0100)]
frame: add a convenience function for copying AVFrame data
Anton Khirnov [Sun, 23 Feb 2014 07:05:52 +0000 (08:05 +0100)]
avconv: support forcing codec tags for input streams