]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 20 Mar 2014 20:44:51 +0000 (21:44 +0100)]
Merge commit '
b045283f2126637477a597f184638ebef09bf898 '
* commit '
b045283f2126637477a597f184638ebef09bf898 ':
ppc: dsputil: Simplify some ifdeffed function definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 20:44:05 +0000 (21:44 +0100)]
Merge commit '
8bd6f88266740068415f7da0628117f1b802efb9 '
* commit '
8bd6f88266740068415f7da0628117f1b802efb9 ':
ppc: dsputil: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 20:30:21 +0000 (21:30 +0100)]
Merge commit '
022184a646896c6b27c6cca387039b030685266e '
* commit '
022184a646896c6b27c6cca387039b030685266e ':
ppc: dsputil: more K&R formatting cosmetics
Conflicts:
libavcodec/ppc/gmc_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 20:29:31 +0000 (21:29 +0100)]
Merge commit '
30f3f959879eee7890973e8cc9ce076450ced111 '
* commit '
30f3f959879eee7890973e8cc9ce076450ced111 ':
ppc: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 20:09:57 +0000 (21:09 +0100)]
Merge commit '
82ee14d2cedd7867920529b408ed6c7ec2f13ff1 '
* commit '
82ee14d2cedd7867920529b408ed6c7ec2f13ff1 ':
ppc: dsputil: comment formatting and wording/grammar improvements
Conflicts:
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/idct_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 20:08:30 +0000 (21:08 +0100)]
Merge commit '
cce791b17becc99f47e097adb93f4b4bbd382e7e '
* commit '
cce791b17becc99f47e097adb93f4b4bbd382e7e ':
hpeldsp_template: Merge some declarations and initializations
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 19:52:19 +0000 (20:52 +0100)]
Merge commit '
2539cf1c814190a017cb8986b41aa2f949e37fd9 '
* commit '
2539cf1c814190a017cb8986b41aa2f949e37fd9 ':
hpeldsp_template: K&R formatting cosmetics
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 19:50:00 +0000 (20:50 +0100)]
Merge commit '
2972087e398454122a82a970ed07924185175c6d '
* commit '
2972087e398454122a82a970ed07924185175c6d ':
hpel_template: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 19:32:19 +0000 (20:32 +0100)]
Merge commit '
e8eace32765da4b42ac3c575fdb2c70cce8aa224 '
* commit '
e8eace32765da4b42ac3c575fdb2c70cce8aa224 ':
hpel_template: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 14:39:45 +0000 (15:39 +0100)]
ffmpeg: try to avoid calling av_log() from sigterm_handler()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Mar 2014 12:14:33 +0000 (13:14 +0100)]
configure: fix direct symbol ref support detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 15 Jan 2014 11:17:20 +0000 (12:17 +0100)]
ppc: dsputil: Simplify some ifdeffed function definitions
Diego Biurrun [Wed, 15 Jan 2014 11:14:20 +0000 (12:14 +0100)]
ppc: dsputil: Drop some unnecessary parentheses
Diego Biurrun [Wed, 15 Jan 2014 17:27:47 +0000 (18:27 +0100)]
ppc: dsputil: more K&R formatting cosmetics
Diego Biurrun [Wed, 15 Jan 2014 11:07:55 +0000 (12:07 +0100)]
ppc: dsputil: K&R formatting cosmetics
Diego Biurrun [Wed, 15 Jan 2014 10:24:43 +0000 (11:24 +0100)]
ppc: dsputil: comment formatting and wording/grammar improvements
Diego Biurrun [Fri, 10 Jan 2014 13:41:47 +0000 (14:41 +0100)]
hpeldsp_template: Merge some declarations and initializations
Diego Biurrun [Fri, 10 Jan 2014 13:26:35 +0000 (14:26 +0100)]
hpeldsp_template: K&R formatting cosmetics
Diego Biurrun [Fri, 10 Jan 2014 11:11:41 +0000 (12:11 +0100)]
hpel_template: Drop some unnecessary parentheses
Diego Biurrun [Fri, 10 Jan 2014 11:11:04 +0000 (12:11 +0100)]
hpel_template: K&R formatting cosmetics
Michael Niedermayer [Thu, 20 Mar 2014 11:53:20 +0000 (12:53 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float-dsp-test: do not use C99's predefined __func__
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 18 Mar 2014 23:09:22 +0000 (00:09 +0100)]
float-dsp-test: do not use C99's predefined __func__
It is not supported by all compilers on FATE. Fixes "some test were
skipped" errors.
James Almer [Thu, 20 Mar 2014 04:40:56 +0000 (01:40 -0300)]
swresample: add swri_resample_float_sse
At least two times faster than the C version.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Wed, 19 Mar 2014 17:26:19 +0000 (17:26 +0000)]
truehd: tune VLC decoding for ARM.
Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant)
6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5%
8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5%
8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6%
6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6%
6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1%
8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4%
8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 20:20:09 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 20:14:27 +0000 (21:14 +0100)]
Merge commit '
606cc8afa1cb782311f68560c8f9bad978cdcc32 '
* commit '
606cc8afa1cb782311f68560c8f9bad978cdcc32 ':
configure: ppc: Disable ldbrx instruction by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 20:09:16 +0000 (21:09 +0100)]
Merge commit '
af9481d7019d46c9f18c4ccac77a5d0c54cf6004 '
* commit '
af9481d7019d46c9f18c4ccac77a5d0c54cf6004 ':
mxf: Lowercase UL strings
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 19:54:12 +0000 (20:54 +0100)]
Merge commit '
6920fb2b33f84b114ea4561ae1c623f4a26562e5 '
* commit '
6920fb2b33f84b114ea4561ae1c623f4a26562e5 ':
mxf: Verbose debug logging
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 19:46:08 +0000 (20:46 +0100)]
Merge commit '
842ea36c747eb6537c4236114346cb7a3e9a8df1 '
* commit '
842ea36c747eb6537c4236114346cb7a3e9a8df1 ':
mxf: Override faulty PreviousPartition entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 19:39:05 +0000 (20:39 +0100)]
Merge commit '
92ebb332157195b7c1212e734c5668afbf19cf2b '
* commit '
92ebb332157195b7c1212e734c5668afbf19cf2b ':
mxf: Add additional H264 PictureEssenceCoding
Conflicts:
libavformat/mxf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 19 Mar 2014 12:50:38 +0000 (14:50 +0200)]
float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions
This fixes fate-float_dsp-test on RVCT 4.0.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 19 Mar 2014 17:01:04 +0000 (18:01 +0100)]
avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1
Fixes Ticket3229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 16:59:42 +0000 (17:59 +0100)]
avcodec/mjpegdec: parse avid data from extradata
Makes no difference for any file tested but is needed
for following bug-fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 16:59:02 +0000 (17:59 +0100)]
avcodec/mjpeg: print info from parse_avid() if requested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 16:57:59 +0000 (17:57 +0100)]
avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID
0 should have been the default, this change should make no difference
but this is needed for the following bugfix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 16:57:02 +0000 (17:57 +0100)]
avcodec/mjpegdec: factorize parse_avid out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 14 Mar 2014 16:20:59 +0000 (17:20 +0100)]
configure: ppc: Disable ldbrx instruction by default
Only enable it for CPUs that support it.
This restores the behavior prior to
7a650caf .
Luca Barbato [Thu, 13 Mar 2014 12:34:16 +0000 (13:34 +0100)]
mxf: Lowercase UL strings
The specification uses lower case most of the time.
Luca Barbato [Thu, 13 Mar 2014 12:38:06 +0000 (13:38 +0100)]
mxf: Verbose debug logging
Print the UL in code format and in the short format used by the
specification.
Luca Barbato [Thu, 13 Mar 2014 15:12:05 +0000 (16:12 +0100)]
mxf: Override faulty PreviousPartition entries
Some files set the PreviousPartition field to point to its own offset.
If we are parsing forward the Previous partition is immediately known
and its value could be used, otherwise we can safely point to the
header.
Reported-By: Jean Baptiste Kempf <jb@videolan.org>
Luca Barbato [Mon, 3 Mar 2014 20:54:26 +0000 (21:54 +0100)]
mxf: Add additional H264 PictureEssenceCoding
Unbreak some MXF Proxy files.
Carl Eugen Hoyos [Wed, 19 Mar 2014 08:11:22 +0000 (09:11 +0100)]
Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.
Carl Eugen Hoyos [Wed, 19 Mar 2014 01:22:04 +0000 (02:22 +0100)]
Add the H.264 decoder as a dependency for the fate-mkv test.
Carl Eugen Hoyos [Wed, 19 Mar 2014 01:08:58 +0000 (02:08 +0100)]
Add one forgotten named inline asm operand in libavcodec/x86/motion_est.c.
Michael Niedermayer [Wed, 19 Mar 2014 01:51:38 +0000 (02:51 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: float_dsp NEON assembler
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 01:38:50 +0000 (02:38 +0100)]
Merge commit '
1b51b7ba00ed72b6ce4c3bcd6897839caa32478c '
* commit '
1b51b7ba00ed72b6ce4c3bcd6897839caa32478c ':
libopenjpeg: Support rgba64 decoding
See:
b7a928b2d1563575a8d9ec5aa606f735620b38ab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 00:29:44 +0000 (01:29 +0100)]
Merge commit '
8f45bd1433a1d8534d7b3997219c4ca31a669042 '
* commit '
8f45bd1433a1d8534d7b3997219c4ca31a669042 ':
libopenjpeg: Support rgba64 encoding
Conflicts:
libavcodec/libopenjpegenc.c
See:
36397ea1c7e27ab850149cc61394c2baa26dd532
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Mar 2014 00:06:29 +0000 (01:06 +0100)]
Merge commit '
1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0 '
* commit '
1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0 ':
libopenjpeg: K&R formatting cosmetics
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Tue, 18 Mar 2014 04:53:26 +0000 (15:53 +1100)]
Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Tue, 18 Mar 2014 04:29:14 +0000 (15:29 +1100)]
avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported
This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 2 Mar 2014 21:54:34 +0000 (22:54 +0100)]
aarch64: float_dsp NEON assembler
Ported from arm NEON and added vector_dmul_scalar.
Functions between 1.5 and 5 times faster than the C implementations
using Apple's clang-503.0.19 on A7.
Carl Eugen Hoyos [Tue, 18 Mar 2014 02:19:18 +0000 (03:19 +0100)]
swscale/utils: Fix color range of gray16
Improves rgb -> gray16 conversion
Fixes Ticket3422
The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sat, 15 Mar 2014 01:34:48 +0000 (02:34 +0100)]
libopenjpeg: Support rgba64 decoding
Carl Eugen Hoyos [Sat, 14 Jan 2012 01:34:16 +0000 (01:34 +0000)]
libopenjpeg: Support rgba64 encoding
Vittorio Giovara [Fri, 14 Mar 2014 23:33:20 +0000 (00:33 +0100)]
libopenjpeg: K&R formatting cosmetics
Michael Niedermayer [Tue, 18 Mar 2014 19:47:04 +0000 (20:47 +0100)]
avcodec/h264pred_template: fix declarations after statements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yogender Kumar Gupta [Tue, 18 Mar 2014 10:31:15 +0000 (16:01 +0530)]
avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction
This is limited to the case where x264_build = -1, to not break x264 decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 19:04:18 +0000 (20:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: add test program and use it as fate test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 18:58:18 +0000 (19:58 +0100)]
Merge commit '
d961a79eb07a8911540a0bd356d68ae0cf93c6a1 '
* commit '
d961a79eb07a8911540a0bd356d68ae0cf93c6a1 ':
sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 18:43:20 +0000 (19:43 +0100)]
Merge commit '
c829b35c08ad8e1df45cca1cd12f084cf1183d07 '
* commit '
c829b35c08ad8e1df45cca1cd12f084cf1183d07 ':
lavc: er: remove unused variable size
No change as the variable is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 18 Mar 2014 03:00:30 +0000 (00:00 -0300)]
swresample: reuse COMMON_CORE asm where possible
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Verkamp [Tue, 18 Mar 2014 07:29:26 +0000 (00:29 -0700)]
ff_put_wav_header: remove manual byte counting
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 17 Mar 2014 20:07:34 +0000 (17:07 -0300)]
swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2
pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 13:08:05 +0000 (14:08 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 12:30:20 +0000 (13:30 +0100)]
Merge commit '
ca80e15814b77efe8d0ff5a5b0220754bb6c4065 '
* commit '
ca80e15814b77efe8d0ff5a5b0220754bb6c4065 ':
mpegts: Forward error codes in various functions
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 12:16:56 +0000 (13:16 +0100)]
Merge commit '
86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a '
* commit '
86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a ':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 3 Mar 2014 18:15:35 +0000 (19:15 +0100)]
float_dsp: add test program and use it as fate test
Janne Grunau [Tue, 18 Mar 2014 11:33:13 +0000 (12:33 +0100)]
sbrdsp: move #if to disable all educational code
Avoids a warning of the unused function 'autocorrelate'.
Janne Grunau [Tue, 18 Mar 2014 11:09:07 +0000 (12:09 +0100)]
lavc: er: remove unused variable size
The code using it was removed in
d66e305bd1b .
Vittorio Giovara [Mon, 17 Mar 2014 17:53:14 +0000 (18:53 +0100)]
svq3: directly set pix_fmt and color_range
Keiji Costantini [Mon, 17 Mar 2014 17:03:08 +0000 (17:03 +0000)]
mpegts: Forward error codes in various functions
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Keiji Costantini [Mon, 17 Mar 2014 17:03:07 +0000 (17:03 +0000)]
mpegts: K&R formatting cosmetics
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Tue, 18 Mar 2014 02:57:41 +0000 (03:57 +0100)]
avfilter/src_movie: Check that the pixel format hasnt changed
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 01:07:20 +0000 (02:07 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Mon, 17 Mar 2014 22:59:36 +0000 (23:59 +0100)]
MAINTAINERS: add myself az mpegts demuxer maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 23:07:53 +0000 (00:07 +0100)]
avcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2()
This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 18 Mar 2014 00:29:50 +0000 (01:29 +0100)]
Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
This allows running more fate tests on remote targets
without the source tree.
James Almer [Mon, 17 Mar 2014 19:40:28 +0000 (16:40 -0300)]
x86/synth_filter: improve FMA version
Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 9 Mar 2014 00:20:41 +0000 (02:20 +0200)]
doc/examples: Add example transcoding.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 17:22:32 +0000 (18:22 +0100)]
avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
This also moves mov_rewrite_dvd_sub_extradata() to mov.c
Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 17:21:11 +0000 (18:21 +0100)]
avformat/mov: fill in subtitle dimensions after parsing tkhd
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 16:08:39 +0000 (17:08 +0100)]
avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Fixes regression with NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 16:06:30 +0000 (17:06 +0100)]
avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()
This avoids the 2nd buffer and fixes the palette truncated check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:28:07 +0000 (16:28 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: check color_range
Conflicts:
libavcodec/libx264.c
See:
48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:22:28 +0000 (16:22 +0100)]
Merge commit '
bf0d7da7cbbf869605086c2a47cdf87f0a533e24 '
* commit '
bf0d7da7cbbf869605086c2a47cdf87f0a533e24 ':
ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:13:59 +0000 (16:13 +0100)]
Merge commit '
2183432e6dc8aedf1ef3db63006a2a8195479abd '
* commit '
2183432e6dc8aedf1ef3db63006a2a8195479abd ':
mdec: set color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:10:17 +0000 (16:10 +0100)]
Merge commit '
1c1fbc70cae44c10af8ff865826e31c17bc9f347 '
* commit '
1c1fbc70cae44c10af8ff865826e31c17bc9f347 ':
mjpeg: set color_range
Conflicts:
libavcodec/mjpegdec.c
See:
2f870e262e953815060de0ebea9b6653133b203e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:56:49 +0000 (15:56 +0100)]
Merge commit '
6612a03d7470af4aa6b8aa313b1eff013691d181 '
* commit '
6612a03d7470af4aa6b8aa313b1eff013691d181 ':
fraps: set color_range
Conflicts:
libavcodec/fraps.c
See:
79f452f4e68696f1daa9f205b35037185959c9ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:54:48 +0000 (15:54 +0100)]
Merge commit '
5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4 '
* commit '
5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4 ':
tiff: Support rgba encoding
Conflicts:
libavcodec/tiffenc.c
See:
d7fc100694f776092ce07f616dbe0f02e73f347f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:51:13 +0000 (15:51 +0100)]
Merge commit '
6d78e852fbf3cab438a2085bcb64b90457c4a851 '
* commit '
6d78e852fbf3cab438a2085bcb64b90457c4a851 ':
img2: add j2c file extension
Conflicts:
libavformat/img2enc.c
See:
e8df18270a50fd57eab06f1718ad9d075b200d98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:43:21 +0000 (15:43 +0100)]
Merge commit '
58c215961a9067bb670387bbd72286c30de04b93 '
* commit '
58c215961a9067bb670387bbd72286c30de04b93 ':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See:
edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:32:07 +0000 (15:32 +0100)]
Merge commit '
cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9 '
* commit '
cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9 ':
png: Support rgb48 and rgba64 encoding
Conflicts:
libavcodec/pngenc.c
See:
f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:24:05 +0000 (15:24 +0100)]
Merge commit '
c598b569fb3d1f4b6c4868fe64f6989254df5186 '
* commit '
c598b569fb3d1f4b6c4868fe64f6989254df5186 ':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 13:52:02 +0000 (14:52 +0100)]
Merge commit '
f7518f1a0e0a1788c303de3c6198da07e575710c '
* commit '
f7518f1a0e0a1788c303de3c6198da07e575710c ':
codec_desc: update dvaudio tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 13:42:37 +0000 (14:42 +0100)]
Michael Niedermayer [Mon, 17 Mar 2014 13:14:10 +0000 (14:14 +0100)]
Merge commit '
1481d24c3a0abf81e1d7a514547bd5305232be30 '
* commit '
1481d24c3a0abf81e1d7a514547bd5305232be30 ':
RGBA64 pixel formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c
See:
9569a3c9f41387a8c7d1ce97d8693520477a66c3
See:
92afb431621c79155fcb7171d26f137eb1bee028 , as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:46:09 +0000 (13:46 +0100)]
Merge commit '
d24e9a99a40166bf881ccd2e3ae5688af4726658 '
* commit '
d24e9a99a40166bf881ccd2e3ae5688af4726658 ':
h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:35:23 +0000 (13:35 +0100)]
avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:31:28 +0000 (13:31 +0100)]
Merge commit '
7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 '
* commit '
7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 ':
mpegvideo: remove h264-only fields
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:23:48 +0000 (13:23 +0100)]
Merge commit '
be039278b5ebd8075d90a3508db2aed5adf59e02 '
* commit '
be039278b5ebd8075d90a3508db2aed5adf59e02 ':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>