]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
avcodec/x86/qpeldsp_init: Restore author attribution
See:
368f50359eb328b0b9d67451f56fda20b3255f9a
See:
44eb49512888143905860af2de2932ab002cdbf7 , and many others
See:
similarity index 83%
copy from libavcodec/x86/dsputil_init.c
copy to libavcodec/x86/qpeldsp_init.c
index
ebbf97f ..
8f296a1 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/qpeldsp_init.c
@@ -1,6 +1,5 @@
/*
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
*
* This file is part of FFmpeg.
*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
qpel_template: Restore author attribution
See:
368f50359eb328b0b9d67451f56fda20b3255f9a
See:
59fe111e8122acc614ace5618e1a4ba7416e9875
See:
similarity index 98%
rename from libavcodec/dsputil_template.c
rename to libavcodec/qpel_template.c
index
95d966e ..
500c75b 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/qpel_template.c
@@ -1,9 +1,5 @@
/*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP function templates
*
* This file is part of FFmpeg.
*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 00:17:55 +0000 (02:17 +0200)]
Merge commit '
368f50359eb328b0b9d67451f56fda20b3255f9a '
* commit '
368f50359eb328b0b9d67451f56fda20b3255f9a ':
dsputil: Split off quarterpel bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)]
Merge commit '
cb52a17cb62297802b0a77e5af9850d87c3f925b '
* commit '
cb52a17cb62297802b0a77e5af9850d87c3f925b ':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 22:59:15 +0000 (00:59 +0200)]
Merge commit '
054013a0fc6f2b52c60cee3e051be8cc7f82cef3 '
* commit '
054013a0fc6f2b52c60cee3e051be8cc7f82cef3 ':
dsputil: Move APE-specific bits into apedsp
Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 22:42:36 +0000 (00:42 +0200)]
Merge commit '
256da0770e495176d1b2699ec6e9c7993c2a6d7b '
* commit '
256da0770e495176d1b2699ec6e9c7993c2a6d7b ':
dsputil: Move mspel_pixels_tab to the only place it is used
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 22:30:42 +0000 (00:30 +0200)]
Merge commit '
3832a6590156e6abc575bed51cbffa78617ee5fd '
* commit '
3832a6590156e6abc575bed51cbffa78617ee5fd ':
dsputil: Move ff_alternate_*_scan tables to mpegvideo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 22:13:12 +0000 (00:13 +0200)]
avcodec/x86/svq1enc_mmx: Add author attribution
See:
5900637219ccccdd39ddafa4e7181da20b8e1f1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 22:01:45 +0000 (00:01 +0200)]
Merge commit '
65d5d5865845f057cc6530a8d0f34db952d9009c '
* commit '
65d5d5865845f057cc6530a8d0f34db952d9009c ':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 21:50:56 +0000 (23:50 +0200)]
Merge commit '
2ea2612df508abdd1f97c6a6ef56275a52c5c41e '
* commit '
2ea2612df508abdd1f97c6a6ef56275a52c5c41e ':
svq1enc: Rename SVQ1Context to SVQ1EncContext
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 21:39:54 +0000 (23:39 +0200)]
ffmpeg: fix check for muxing overhead being unknown
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 29 May 2014 20:05:57 +0000 (17:05 -0300)]
x86/dsputilenc: add missing guards to ff_pix_sum16_xop
XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still
support older versions.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 28 May 2014 13:52:24 +0000 (15:52 +0200)]
x86: huffyuvdsp: port add_bytes to yasm
C MMX SSE2
Cycles: 2972 587 302
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 26 May 2014 19:59:14 +0000 (21:59 +0200)]
x86: hpeldsp: better factorization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 29 May 2014 16:48:39 +0000 (18:48 +0200)]
tests: allow passing dimensions to videogen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 17:49:29 +0000 (19:49 +0200)]
rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 17:49:29 +0000 (19:49 +0200)]
rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 17:48:23 +0000 (19:48 +0200)]
rename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 29 May 2014 03:57:39 +0000 (00:57 -0300)]
x86/dsputilenc: implement XOP version of pix_sum16
SSE2: 137 cycles
XOP: 87 cycles
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 16:14:56 +0000 (18:14 +0200)]
Merge commit '
08cd92144e73195eecc28ed0348e66e255516b82 '
* commit '
08cd92144e73195eecc28ed0348e66e255516b82 ':
aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 15:26:26 +0000 (17:26 +0200)]
avcodec/dpx_parser: Allow frame size to be too small
Fixes Ticket3402
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 15:22:26 +0000 (17:22 +0200)]
avcodec/dpx_parser: fix flushing end out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 15:08:53 +0000 (17:08 +0200)]
avcodec/dpx_parser: reset index when finding a startcode, not after
This is simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 8 Jan 2014 13:00:10 +0000 (14:00 +0100)]
dsputil: Split off quarterpel bits into their own context
Diego Biurrun [Sun, 29 Dec 2013 10:53:00 +0000 (11:53 +0100)]
dsputil: Move Bink-specific add_pixels8 to binkdsp
Diego Biurrun [Sun, 29 Dec 2013 01:32:16 +0000 (02:32 +0100)]
dsputil: Move APE-specific bits into apedsp
Diego Biurrun [Fri, 27 Dec 2013 09:29:14 +0000 (10:29 +0100)]
dsputil: Move mspel_pixels_tab to the only place it is used
Diego Biurrun [Fri, 27 Dec 2013 00:12:23 +0000 (01:12 +0100)]
dsputil: Move ff_alternate_*_scan tables to mpegvideo
Diego Biurrun [Mon, 23 Dec 2013 18:48:43 +0000 (19:48 +0100)]
dsputil: Move SVQ1 encoding specific bits into svq1enc
Diego Biurrun [Mon, 23 Dec 2013 18:18:16 +0000 (19:18 +0100)]
svq1enc: Rename SVQ1Context to SVQ1EncContext
This allows making it visible without name clashes.
Christophe Gisquet [Thu, 29 May 2014 09:10:39 +0000 (09:10 +0000)]
huffyuv: change left prediction access in BGRA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 29 May 2014 09:10:38 +0000 (09:10 +0000)]
huffyuv: avoid duplicated defines
Move the defines to the dsp header.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 29 May 2014 11:37:31 +0000 (14:37 +0300)]
aarch64: Use the correct syntax for relocations
This fixes building in PIC mode with gas. The examples in the gas
manual showed using a # here even though gas itself actually didn't
support that syntax (and the gas test suite only tests it without
the extra hash sign).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 29 May 2014 11:40:42 +0000 (13:40 +0200)]
Merge commit '
962d63157322466a9a82f9f9d84c1b6f1b582f65 '
* commit '
962d63157322466a9a82f9f9d84c1b6f1b582f65 ':
matroskaenc: set the stream timebase earlier
Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 11:26:55 +0000 (13:26 +0200)]
Merge commit '
43e7f0797f9f821a3866a20f05e512e13c82076a '
* commit '
43e7f0797f9f821a3866a20f05e512e13c82076a ':
flvenc: only write the framerate tag based on avg_frame_rate
Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/vsynth2-flv
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 11:05:35 +0000 (13:05 +0200)]
Merge commit '
cf6977712c9e5abe6dc55289f6322ccbf10321a9 '
* commit '
cf6977712c9e5abe6dc55289f6322ccbf10321a9 ':
movenc: write avg_frame_rate as the framerate, not the codec timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 10:48:36 +0000 (12:48 +0200)]
Merge commit '
81eec081afea9fc017a175581ceea7c420a0dfc3 '
* commit '
81eec081afea9fc017a175581ceea7c420a0dfc3 ':
matroskaenc: base DefaultDuration on the framerate, not the codec timebase
Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
See:
ea83b032af825d10f7d6db8a71933edce5b842a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 10:34:12 +0000 (12:34 +0200)]
Merge commit '
a53551cba86bb67efcb6105fdc337a36c43132bd '
* commit '
a53551cba86bb67efcb6105fdc337a36c43132bd ':
frame: fix the error path in av_frame_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 27 May 2014 08:28:24 +0000 (10:28 +0200)]
matroskaenc: set the stream timebase earlier
Fixes calculating the ts offset for audio codecs with delay.
Anton Khirnov [Tue, 27 May 2014 07:49:29 +0000 (09:49 +0200)]
flvenc: only write the framerate tag based on avg_frame_rate
Do not fall back on the codec timebase, since that can be anything for
VFR video.
Anton Khirnov [Sun, 18 May 2014 11:49:46 +0000 (13:49 +0200)]
movenc: write avg_frame_rate as the framerate, not the codec timebase
Anton Khirnov [Sun, 18 May 2014 11:49:46 +0000 (13:49 +0200)]
matroskaenc: base DefaultDuration on the framerate, not the codec timebase
This results in DefaultDuration not being written when the framerate is
not known, but as this field is purely informative, this should not
break any sane demuxers.
Roman Savchenko [Wed, 28 May 2014 20:16:56 +0000 (22:16 +0200)]
frame: fix the error path in av_frame_copy_props()
First free metadata, then the side data it is contained in.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 29 May 2014 02:25:26 +0000 (04:25 +0200)]
avformat/nutenc: replace conditional by assert
Its implied by sp_count==0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 01:48:02 +0000 (03:48 +0200)]
avformat/nutenc: limit index table size if no index is going to be written
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 01:32:44 +0000 (03:32 +0200)]
avformat/nutenc: add mode that omits the index
When the index is not written, several data tables become unneeded,
reducing memory and cpu requirements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 May 2014 01:20:04 +0000 (03:20 +0200)]
nutenc: avoid av_tree_find() operation per syncpoint
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:48:02 +0000 (01:48 +0200)]
avformat/nutdec: Fix handling of older 4.0 files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:44:02 +0000 (01:44 +0200)]
avformat/nutenc: bump minor version due to broadcast/pipe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:41:56 +0000 (01:41 +0200)]
avformat/nutenc: change check to match comment
The code appears to assume STABLE will never change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:37:46 +0000 (01:37 +0200)]
avformat/nutenc: fix used version value
The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based
on which is stable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:24:26 +0000 (01:24 +0200)]
Merge commit '
ad0fe2f4012031c47268f14b9835088c488e1998 '
* commit '
ad0fe2f4012031c47268f14b9835088c488e1998 ':
af_resample: Use avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:18:17 +0000 (01:18 +0200)]
Merge commit '
b2d45654220503224aa94e78cdff19ec624e9342 '
* commit '
b2d45654220503224aa94e78cdff19ec624e9342 ':
avresample: Add avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 23:09:51 +0000 (01:09 +0200)]
Merge commit '
c94e2e85cb6af8a570d8542a830556243bd32873 '
* commit '
c94e2e85cb6af8a570d8542a830556243bd32873 ':
nut: Support experimental NUT 4 features
Conflicts:
doc/nut.texi
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 22:20:48 +0000 (00:20 +0200)]
Merge commit '
6d212599aa684f30511fb08ca30fe2378405304e '
* commit '
6d212599aa684f30511fb08ca30fe2378405304e ':
avformat: Provide a standard compliance flag
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 22:11:33 +0000 (00:11 +0200)]
libavcodec/x86/dsputilenc: drop and 0xffff that should have becomei redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 27 May 2014 16:57:15 +0000 (13:57 -0300)]
x86/dsputilenc: implement SSE2 versions of pix_{sum16, norm1}
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 May 2014 23:56:13 +0000 (01:56 +0200)]
tests/fate/opus: change test to use the official reference samples
The official samples are 50% smaller
Avoid having reference samples which are strongly linked to the used resampler
implementation. (which for example would require new samples to be used if this
implementation changes)
Also its more correct to use the official samples instead of the current
decoder output
also enable tests
The tests also fully pass as well with the previous samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 26 May 2014 19:30:30 +0000 (21:30 +0200)]
af_resample: Use avresample_get_out_samples
Konrad Iturbe [Tue, 27 May 2014 18:14:48 +0000 (20:14 +0200)]
INSTALL: add markdown syntax
Reviewed-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Konrad Iturbe [Tue, 27 May 2014 18:14:48 +0000 (20:14 +0200)]
LICENCE: add markdown syntax
Reviewed-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Konrad Iturbe [Tue, 27 May 2014 18:14:48 +0000 (20:14 +0200)]
README: add markdown syntax
Reviewed-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 30 Apr 2014 17:56:05 +0000 (19:56 +0200)]
avresample: Add avresample_get_out_samples
Utility function to get the upper bound on the number of samples the
resampler would output.
Luca Barbato [Thu, 6 Mar 2014 16:58:34 +0000 (17:58 +0100)]
nut: Support experimental NUT 4 features
Add the low overhead pipe mode and the extended broadcast mode.
Export the options as 'syncponts' since it impacts only that.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Thu, 6 Mar 2014 16:58:33 +0000 (17:58 +0100)]
avformat: Provide a standard compliance flag
Provide f_strict for avconv usage.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Wed, 28 May 2014 20:03:34 +0000 (22:03 +0200)]
Merge commit '
7dba055bb0d31b2c79d9c3a66abb849a71417d3c '
* commit '
7dba055bb0d31b2c79d9c3a66abb849a71417d3c ':
oggenc: Fix the EOS flag
Conflicts:
tests/ref/lavf/ogg
See:
919c320f7226bf873a9148e1db8994745f9d425d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 17:27:40 +0000 (10:27 -0700)]
oggenc: Fix the EOS flag
This corrects the bug that caused the checksums to change in
9767d7c092c890ecc5953452e8a951fd902dd67b .
It caused the EOS flag to be set incorrectly; the ogg spec does not
allow it to be set in the middle of a logical bitstream.
Signed-off-by: Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
Vignesh Venkatasubramanian [Wed, 28 May 2014 15:44:07 +0000 (08:44 -0700)]
lavf: Remove experimental flag for Opus in WebM
Opus in WebM is no more experimental as we have everything necessary in
the container writing code as per the spec. So removing the experimental flag.
Note that we removed the experimental suffix from the CodecId field long
ago ( http://goo.gl/O0TYRB ).
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lazaros Koromilas [Wed, 28 May 2014 13:31:03 +0000 (16:31 +0300)]
libavformat/utils: Warning about invalid cover art instead of an error
This way other streams can still be used with the -map option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 17 May 2014 10:22:39 +0000 (12:22 +0200)]
x86: hevc_mc: better register allocation
The xmm reg count was incorrect, and manual loading of the gprs
furthermore allows to noticeable reduce the number needed.
The modified functions are used in weighted prediction, so only a
few samples like WP_* exhibit a change. For this one and Win64
(some widths removed because of too few occurrences):
WP_A_Toshiba_3.bit, ff_hevc_put_hevc_uni_w
16 32
before: 2194 3872
after: 2119 3767
WP_B_Toshiba_3.bit, ff_hevc_put_hevc_bi_w
16 32 64
before: 2819 4960 9396
after: 2617 4788 9150
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 14:23:25 +0000 (16:23 +0200)]
avcodec/mjpegdec: Support pix_fmt_id== 0x42111100
Fixes: 538782_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 13:15:14 +0000 (15:15 +0200)]
avformat/matroskaenc: fix ident string
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 12:53:31 +0000 (14:53 +0200)]
Merge commit '
b5aa48551300eed678aaea86ced7086758598a35 '
* commit '
b5aa48551300eed678aaea86ced7086758598a35 ':
ppc: Move vec_unaligned_load macro to util_altivec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 12:44:26 +0000 (14:44 +0200)]
Merge commit '
593886b5dd2b583657aa3fd80bb173f702c9710d '
* commit '
593886b5dd2b583657aa3fd80bb173f702c9710d ':
ppc: util_altivec: Drop unused macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)]
Merge commit '
106b62f4ba600f24415eaded5e020aeceb23fd59 '
* commit '
106b62f4ba600f24415eaded5e020aeceb23fd59 ':
matroskaenc: write the channel mask for FLAC
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 11:08:50 +0000 (13:08 +0200)]
Merge commit '
efcde917af407a6031ecff68edd51fce7b83d104 '
* commit '
efcde917af407a6031ecff68edd51fce7b83d104 ':
vorbiscomment: simplify API by using av_dict_count()
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 11:01:41 +0000 (13:01 +0200)]
Merge commit '
23f741f79327e31be7b2a75ebb2e02111e06e52f '
* commit '
23f741f79327e31be7b2a75ebb2e02111e06e52f ':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 10:49:28 +0000 (12:49 +0200)]
Merge commit '
4efdadc8ec50332c812e8a95e8c67f5a260e7cb0 '
* commit '
4efdadc8ec50332c812e8a95e8c67f5a260e7cb0 ':
matroskadec: export just the STREAMINFO block as FLAC extradata
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 10:41:35 +0000 (12:41 +0200)]
Merge commit '
6df478bf891b9fc5626e4a0b993899f310ba0a1c '
* commit '
6df478bf891b9fc5626e4a0b993899f310ba0a1c ':
matroskadec: split parsing tracks into a separate function
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 10:33:07 +0000 (12:33 +0200)]
Merge commit '
5fdaf312c5541b77b6364db8b49d6abb416a25c0 '
* commit '
5fdaf312c5541b77b6364db8b49d6abb416a25c0 ':
flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 28 May 2014 10:29:33 +0000 (03:29 -0700)]
ppc: Move vec_unaligned_load macro to util_altivec
This allows reusing it from multiple files.
Michael Niedermayer [Wed, 28 May 2014 10:28:23 +0000 (12:28 +0200)]
Merge commit '
54ed488b1af583df6c9d2a73b4a44f16b7e4f82c '
* commit '
54ed488b1af583df6c9d2a73b4a44f16b7e4f82c ':
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 10:20:44 +0000 (12:20 +0200)]
Merge commit '
d6b9ce99ea384fb676561461768b8316725a4ccd '
* commit '
d6b9ce99ea384fb676561461768b8316725a4ccd ':
flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 May 2014 10:09:42 +0000 (12:09 +0200)]
Merge commit '
f13ffb6636fdecb5e3e0ddcff48f096e7b3db362 '
* commit '
f13ffb6636fdecb5e3e0ddcff48f096e7b3db362 ':
flacdec: do not overwrite a channel layout set by the caller
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 28 May 2014 10:11:24 +0000 (03:11 -0700)]
ppc: util_altivec: Drop unused macros
Anton Khirnov [Mon, 26 May 2014 11:53:13 +0000 (13:53 +0200)]
matroskaenc: write the channel mask for FLAC
Anton Khirnov [Mon, 26 May 2014 11:30:10 +0000 (13:30 +0200)]
vorbiscomment: simplify API by using av_dict_count()
Anton Khirnov [Mon, 26 May 2014 10:48:56 +0000 (12:48 +0200)]
matroskadec: parse the channel layout mask for FLAC
It is commonly stored in a vorbiscomment block in codec private data.
Anton Khirnov [Sun, 25 May 2014 12:05:51 +0000 (14:05 +0200)]
matroskadec: export just the STREAMINFO block as FLAC extradata
It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
Anton Khirnov [Sun, 25 May 2014 07:07:32 +0000 (09:07 +0200)]
matroskadec: split parsing tracks into a separate function
Anton Khirnov [Mon, 26 May 2014 07:43:50 +0000 (09:43 +0200)]
flac: make avpriv_flac_parse_block_header() inline
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
Anton Khirnov [Sun, 25 May 2014 09:34:32 +0000 (11:34 +0200)]
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Anton Khirnov [Sun, 25 May 2014 09:14:14 +0000 (11:14 +0200)]
flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
It is used to store the channel mask for non-standard layouts.
Anton Khirnov [Sun, 25 May 2014 09:12:33 +0000 (11:12 +0200)]
flacdec: do not overwrite a channel layout set by the caller
The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.
Lukasz Marek [Tue, 27 May 2014 21:04:52 +0000 (23:04 +0200)]
ffmpeg: add -devices param
FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lazaros Koromilas [Tue, 27 May 2014 11:38:44 +0000 (14:38 +0300)]
libavformat/utils: Fix segfault on m4a cover artwork parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thierry Foucu [Tue, 27 May 2014 18:23:09 +0000 (11:23 -0700)]
Timecode: Support 48fps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 May 2014 23:06:26 +0000 (01:06 +0200)]
avformat/oggenc: fix EOS flag
This corrects the bug that caused the checksums to change in
9767d7c092c890ecc5953452e8a951fd902dd67b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 May 2014 22:57:49 +0000 (00:57 +0200)]
Merge commit '
9767d7c092c890ecc5953452e8a951fd902dd67b '
* commit '
9767d7c092c890ecc5953452e8a951fd902dd67b ':
oggenc: Flush after writing headers
Conflicts:
tests/ref/lavf/ogg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 May 2014 22:27:23 +0000 (00:27 +0200)]
Merge commit '
1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1 '
* commit '
1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1 ':
oggenc: Move ogg_write_pages up above ogg_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>