]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Sat, 31 May 2014 11:27:01 +0000 (13:27 +0200)]
lavc/utvideoenc: Enable frame-threading.
Carl Eugen Hoyos [Sat, 31 May 2014 11:25:31 +0000 (13:25 +0200)]
Use rc_max_rate in av_find_best_stream() if bitrate == 0.
Fixes ticket #2042.
John Peebles [Thu, 22 May 2014 07:22:15 +0000 (03:22 -0400)]
libavformat: output cues for each subtitle block in MKV muxer
Signed-off-by: John Peebles <johnpeeb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 May 2014 10:37:53 +0000 (12:37 +0200)]
Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from
abb810db036628e11a5171134ebe320b187ee6d6 "
This has become unneeded due to
f797b134cad4d248b1c8955659997980d0668bc3
This reverts commit
1fe40e1b0538a8eb8425123c47775b5d141ae084 .
Michael Niedermayer [Sat, 31 May 2014 10:37:01 +0000 (12:37 +0200)]
Merge commit '
f797b134cad4d248b1c8955659997980d0668bc3 '
* commit '
f797b134cad4d248b1c8955659997980d0668bc3 ':
rtpenc_chain: Don't copy the time base to the source stream by default
See:
1fe40e1b0538a8eb8425123c47775b5d141ae084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 30 May 2014 22:09:58 +0000 (01:09 +0300)]
rtpenc_chain: Don't copy the time base to the source stream by default
Only copy it manually in the muxers where it makes sense (rtspenc,
sapenc). Don't touch the original AVStream in movenchint, where
the original AVStream should be kept untouched.
This fixes the normal tracks in RTP hinted files after
abb810db - the hint tracks were ok while the normal media tracks
were broken, noticed by Michael Niedermayer.
This reverts
abb810db but achieves the same effect for the other
muxers.
Signed-off-by: Martin Storsjö <martin@martin.st>
Christophe Gisquet [Fri, 30 May 2014 11:05:11 +0000 (13:05 +0200)]
huffyuv: increase VLC_BITS to 12
May require a different tuning for arm chips?
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 23:43:41 +0000 (01:43 +0200)]
avformat/flvenc: fix assertion failure after 4h muxing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 30 May 2014 21:49:22 +0000 (18:49 -0300)]
build: fix compilation of svq1enc_mmx.c with --disable-mmx
It's needed for ff_svq1enc_init_x86() even if simd functions are disabled.
Alternatively, svq1enc_init.c could be made and the relevant code moved there.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 30 May 2014 21:49:23 +0000 (18:49 -0300)]
x86/huffyuvdsp: fix some prototypes
Remove duplicate prototypes and fix int -> intptr_t in another
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 21:12:45 +0000 (23:12 +0200)]
Merge commit '
d6d767d93e532246cacf3567e6bcad76a821f838 '
* commit '
d6d767d93e532246cacf3567e6bcad76a821f838 ':
ppc: Fix compilation for ppc64le (ELFv2)
Conflicts:
libavcodec/ppc/asm.S
See:
41b928c5fad7d4ed8477b68cb0c2d54a70b0afac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 20:51:57 +0000 (22:51 +0200)]
avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from
abb810db036628e11a5171134ebe320b187ee6d6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 20:03:34 +0000 (22:03 +0200)]
Merge commit '
abb810db036628e11a5171134ebe320b187ee6d6 '
* commit '
abb810db036628e11a5171134ebe320b187ee6d6 ':
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Thierry Fauck [Thu, 29 May 2014 12:22:27 +0000 (15:22 +0300)]
ppc: Fix compilation for ppc64le (ELFv2)
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 29 May 2014 09:22:26 +0000 (12:22 +0300)]
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
While it strictly isn't necessary to copy the time base (since
any use of it is scaled in ff_write_chained), it still is better
to signal the actual time base to the caller, avoiding one
unnecessary rescaling. This also lets the caller know what the
actual internal time base is, in case that is useful info
for some caller.
This reverts commit
397ffde115f4e0482a007b672f40457596cebfc4 .
Signed-off-by: Martin Storsjö <martin@martin.st>
Christophe Gisquet [Fri, 30 May 2014 09:57:56 +0000 (11:57 +0200)]
x86: huffyuvdsp: fewer functions for x86_64
When there are 2 functions that are <= SSE2, only one is needed for x86_64.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 19:00:34 +0000 (21:00 +0200)]
avcodec/options: leave priv_data in avcodec_copy_context() intact
previously it was freed but the pointer not cleared
Found-by: ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 16:43:22 +0000 (18:43 +0200)]
avcodec/proresenc_anatoliy: simplify get()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 16:42:01 +0000 (18:42 +0200)]
avcodec/proresenc_anatoliy: load 4 samples at a time in get()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 16:03:22 +0000 (18:03 +0200)]
avcodec/proresenc_anatoliy: Use fdct from DSPContext instead of direct call.
Based-on:
a55546f48d55e3d1155840541b2be5f4f8cf18ab by Diego Biurrun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 16:22:00 +0000 (18:22 +0200)]
avcodec/proresenc_anatoliy: Set bits_per_raw_sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 15:53:36 +0000 (17:53 +0200)]
avformat/nutenc: Suggest genpts if AV_NOPTS_VALUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 30 May 2014 15:33:37 +0000 (17:33 +0200)]
Fix VDPAU decoders, regression since
f2f99f07 .
Timothy Gu [Fri, 30 May 2014 03:56:03 +0000 (20:56 -0700)]
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 30 May 2014 03:56:01 +0000 (20:56 -0700)]
x86: dsputilenc: move all the function prototypes together
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 30 May 2014 03:56:02 +0000 (20:56 -0700)]
tests: Add MPEG4 nsse test
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 28 May 2014 19:57:38 +0000 (21:57 +0200)]
x86: huffyuvdsp: add_hfyu_left_pred_bgr32
C MMX SSE2
Cycles: 3092 1053 578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 13:07:36 +0000 (15:07 +0200)]
avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()
This avoids potential issues with the high 32bits being random in x86-64 asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 27 May 2014 23:03:23 +0000 (01:03 +0200)]
x86: huffyuvdsp: add SSE2 median prediction
From 5010c to 4566 on lagarith YUY2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 May 2014 03:21:24 +0000 (05:21 +0200)]
avformat/matroskadec: fix off by 1 error in matroska_read_seek()
Fixes out of array read
Fixes: vp9-opus-crash.webm
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Ausserhaus [Thu, 29 May 2014 11:30:37 +0000 (13:30 +0200)]
avcodec/indeo4: Decode both parts of IP frames
Fixes part of Ticket845
av_frame_move_ref() idea by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Ausserhaus [Thu, 29 May 2014 11:17:49 +0000 (13:17 +0200)]
avcodec/indeo4: Move frametypes into common header.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 30 May 2014 05:38:19 +0000 (07:38 +0200)]
Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init().
Fixes a regression since
ef48ac65 when decoding speex in f4v, reported
by irc user massdos.
Carl Eugen Hoyos [Fri, 30 May 2014 05:26:18 +0000 (07:26 +0200)]
Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.
Fixes ticket #3645.
Michael Niedermayer [Fri, 30 May 2014 01:09:23 +0000 (03:09 +0200)]
avcodec/qpeldsp: Restore author attribution
See:
368f50359eb328b0b9d67451f56fda20b3255f9a
See:
similarity index 51%
copy from libavcodec/dsputil.c
copy to libavcodec/qpeldsp.c
index
6d41dfc ..
0beeab8 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/qpeldsp.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 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)]
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>