]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 22 Jun 2014 22:31:22 +0000 (00:31 +0200)]
Merge commit '
85d805d5cccb2f57e7f2e2254d7a870f05926cfd '
* commit '
85d805d5cccb2f57e7f2e2254d7a870f05926cfd ':
build: Add missing object files for webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:19:41 +0000 (00:19 +0200)]
Merge commit '
03391b5432a2b8b8dbc3d2db722a54dfb68737b9 '
* commit '
03391b5432a2b8b8dbc3d2db722a54dfb68737b9 ':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:13:34 +0000 (00:13 +0200)]
Merge commit '
49470b9404583ab3aff6835f78a759349d331696 '
* commit '
49470b9404583ab3aff6835f78a759349d331696 ':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 21:54:51 +0000 (23:54 +0200)]
ffmpeg: fix reinitializing with threads while flushing
With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost
This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time
Fixes hqx fate with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sun, 22 Jun 2014 07:24:33 +0000 (12:54 +0530)]
ffmpeg: fix transcoding dvbsub to dvbsub
fix ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sun, 22 Jun 2014 07:24:33 +0000 (12:54 +0530)]
avcodec/dvbsubdec: support returning exact end times
fixess part of ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 18:49:00 +0000 (20:49 +0200)]
avfilter/vf_blend: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 18:48:43 +0000 (20:48 +0200)]
avfilter/unsharp_opencl: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 22 Jun 2014 17:47:54 +0000 (14:47 -0300)]
x86/audiodsp: move asm code out of dsputil
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 22 Jun 2014 14:31:09 +0000 (17:31 +0300)]
drawtext: drop unused draw_glyphs() arg "rgbcolor"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 15:58:28 +0000 (17:58 +0200)]
Merge commit '
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 '
* commit '
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 ':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 20 Jun 2014 10:31:32 +0000 (03:31 -0700)]
build: Add missing object files for webm muxer
Diego Biurrun [Fri, 20 Jun 2014 10:22:10 +0000 (03:22 -0700)]
build: Add missing object files for Matroska demuxer
Diego Biurrun [Fri, 20 Jun 2014 10:15:38 +0000 (03:15 -0700)]
build: Add missing replaygain object file for CAF demuxer
Diego Biurrun [Thu, 16 Jan 2014 16:30:19 +0000 (17:30 +0100)]
dsputil: Split audio operations off into a separate context
Ronald S. Bultje [Sat, 21 Jun 2014 21:09:29 +0000 (17:09 -0400)]
swr: remove another forgotten division in DSP function.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 03:17:23 +0000 (05:17 +0200)]
avfilter/vf_hqx: remove << 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 03:02:04 +0000 (05:02 +0200)]
fate/filter-video: fix hqx on big endian part 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 02:55:17 +0000 (04:55 +0200)]
avfilter/vf_hqx: partly fix big endian fate test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 01:03:12 +0000 (03:03 +0200)]
swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding
This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 00:32:30 +0000 (02:32 +0200)]
swscale/x86/input: prevent RGB32_TO_UV_FN from reading into the padding
This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 21:05:43 +0000 (23:05 +0200)]
avfilter/deshake_opencl: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 21:04:20 +0000 (23:04 +0200)]
avfilter/avf_showspectrum: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 21 Jun 2014 20:34:13 +0000 (22:34 +0200)]
avfilter/hqx: add some self promotion in doxy.
This is useful to understand how it's different from the original code.
Clément Bœsch [Sat, 21 Jun 2014 20:32:49 +0000 (22:32 +0200)]
avfilter/hqx: unroll the pattern calculation
Code si smaller, no speed difference.
Michael Niedermayer [Sat, 21 Jun 2014 18:27:45 +0000 (20:27 +0200)]
avformat/flvdec: give live_flvdec a separate name
This should fix a infinite loop on freebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Jun 2014 17:35:06 +0000 (19:35 +0200)]
Show duration for large asf files as written in the file header.
Fixes ticket #3428.
Carl Eugen Hoyos [Sat, 21 Jun 2014 17:34:10 +0000 (19:34 +0200)]
Do not show libzvbi in the configure output if it was not enabled.
It is already shown in the list of external libraries if it was enabled.
Clément Bœsch [Fri, 7 Jun 2013 08:57:29 +0000 (10:57 +0200)]
avfilter: add hqx filter (hq2x, hq3x, hq4x)
Partially fixes Ticket #3404 (xbr filter remaining)
Michael Niedermayer [Sat, 21 Jun 2014 14:57:23 +0000 (16:57 +0200)]
avcodec/libtwolame: fix encoding lsf with defaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 12:55:32 +0000 (14:55 +0200)]
avcodec/bitstream: document the double volatile
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sat, 21 Jun 2014 11:03:36 +0000 (13:03 +0200)]
ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 21 Jun 2014 09:53:43 +0000 (11:53 +0200)]
build: Add missing object file for Matroska demuxer
Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Sat, 21 Jun 2014 02:05:28 +0000 (04:05 +0200)]
avcodec/ituh263enc: fix advanced intra coding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 21:18:45 +0000 (23:18 +0200)]
Merge commit '
ca1e36a8e4cd416142487071dbca734567bdaddf '
* commit '
ca1e36a8e4cd416142487071dbca734567bdaddf ':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 21:02:52 +0000 (23:02 +0200)]
avcodec/utils: check sar only when width/height are set
This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 20:20:28 +0000 (22:20 +0200)]
Merge commit '
9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 '
* commit '
9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 ':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 19:54:23 +0000 (21:54 +0200)]
avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2
gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 19:22:30 +0000 (21:22 +0200)]
avcodec/x86/rv40dsp_init: fix () in macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 16:48:20 +0000 (18:48 +0200)]
avcodec/wavpackenc: fix () in macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Barsnick [Fri, 20 Jun 2014 08:16:01 +0000 (10:16 +0200)]
fix several typos
Vittorio Giovara [Fri, 20 Jun 2014 16:48:06 +0000 (12:48 -0400)]
h264: fix build when error resilience is disabled
Michael Niedermayer [Fri, 20 Jun 2014 16:10:26 +0000 (18:10 +0200)]
Merge commit '
d349afb07bacccb62eb5369c38d6406d2909d792 '
* commit '
d349afb07bacccb62eb5369c38d6406d2909d792 ':
dv: cosmetics, reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 16:00:42 +0000 (18:00 +0200)]
Merge commit '
650dee63c8b1e6693c6cf5983f4a5ed3f571379f '
* commit '
650dee63c8b1e6693c6cf5983f4a5ed3f571379f ':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 15:15:39 +0000 (17:15 +0200)]
Merge commit '
778111592bf5f38630858ee6dfcfd097cd6c6da9 '
* commit '
778111592bf5f38630858ee6dfcfd097cd6c6da9 ':
dvenc: initialize the profile only once, at init
Conflicts:
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 15:03:58 +0000 (17:03 +0200)]
Merge commit '
452860d7e056f9a894cac2fe52cdedeae4c38251 '
* commit '
452860d7e056f9a894cac2fe52cdedeae4c38251 ':
Use av_packet_rescale_ts() to simplify code.
Conflicts:
doc/examples/muxing.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)]
Merge commit '
874390e163427c1fe7682ab27924a7843780dbb3 '
* commit '
874390e163427c1fe7682ab27924a7843780dbb3 ':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 28 Apr 2014 20:08:33 +0000 (16:08 -0400)]
Add av_image_check_sar() and use it to validate SAR
James Almer [Thu, 19 Jun 2014 05:31:46 +0000 (02:31 -0300)]
configure: remove superfluous check for AVX/FMA3 support in Yasm
The minimum Yasm/NASM version required to compile ffmpeg supports both
instruction sets
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 20 Jun 2014 02:10:29 +0000 (19:10 -0700)]
doc: remove RELEASE_NOTES
It hasn't been used since 0.11, and it does not contain any useful
information except for the code name.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 18 Jun 2014 09:02:24 +0000 (11:02 +0200)]
dv: cosmetics, reindent
Anton Khirnov [Wed, 18 Jun 2014 08:59:37 +0000 (10:59 +0200)]
dv: get rid of global non-const tables
Instead, store them in the context and compute on each parameter change.
Anton Khirnov [Wed, 18 Jun 2014 08:39:13 +0000 (10:39 +0200)]
dvenc: initialize the profile only once, at init
We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.
Anton Khirnov [Wed, 18 Jun 2014 07:43:27 +0000 (09:43 +0200)]
Use av_packet_rescale_ts() to simplify code.
Anton Khirnov [Wed, 18 Jun 2014 07:39:32 +0000 (09:39 +0200)]
lavc: add a convenience function for rescaling timestamps in a packet
Stefano Sabatini [Mon, 9 Jun 2014 17:32:37 +0000 (19:32 +0200)]
lavc/h264_slice: clarify informational message in case of disabled slice multi-threaded decoding
Also suggest what can be done to workaround the limitation.
Stefano Sabatini [Mon, 9 Jun 2014 17:02:53 +0000 (19:02 +0200)]
doc/codecs: extend documentation for thread_type option
Based on avcodec.h documentation.
Timothy Gu [Tue, 10 Jun 2014 04:46:37 +0000 (21:46 -0700)]
tests/fate.sh: report different status for different errors
The order of error codes will be useful in my future fateserver patches.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 21:47:07 +0000 (23:47 +0200)]
Merge commit '
440842c4eb1d7709654ec97cd687663d11ef499c '
* commit '
440842c4eb1d7709654ec97cd687663d11ef499c ':
stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 21 Apr 2014 00:33:35 +0000 (02:33 +0200)]
stereo3d: add missing include guards
James Almer [Thu, 19 Jun 2014 20:28:26 +0000 (17:28 -0300)]
alpha/blockdsp: move clear_blocks out of dsputil
The blockdsp split did not cover Alpha optimizations
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaullier Nicolas [Thu, 19 Jun 2014 17:26:31 +0000 (17:26 +0000)]
avformat/utils: better probing for duration in estimate_timings_from_pts()
It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 17:49:26 +0000 (19:49 +0200)]
avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 19 Jun 2014 16:45:13 +0000 (18:45 +0200)]
s86/scale: Do not return the result of a (void) function from a void function.
Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.
James Almer [Thu, 19 Jun 2014 16:29:43 +0000 (13:29 -0300)]
x86/blockdsp: restore author attribution
See commits
649c00c96d7044aed46d70623e47d7434318e6b9
5fecfb7d58a12baf326e99f2d071060f2638d93c
73b02e24604961e49a63ca34203d8f6c56612117
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 16:00:20 +0000 (18:00 +0200)]
Merge commit '
852c329a69ddfd635807f60454df07d021c64901 '
* commit '
852c329a69ddfd635807f60454df07d021c64901 ':
configure: Drop duplicate pkg-config entry from help output
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 18 Jun 2014 14:45:45 +0000 (16:45 +0200)]
configure: Drop duplicate pkg-config entry from help output
Michael Niedermayer [Thu, 19 Jun 2014 13:12:22 +0000 (15:12 +0200)]
Merge commit '
b2290bf10b12b7772f55fcab014a47e18e9fdef2 '
* commit '
b2290bf10b12b7772f55fcab014a47e18e9fdef2 ':
i263: skip dummy frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Jun 2014 16:55:27 +0000 (18:55 +0200)]
avcodec: add simpleauto idct
This will pick the "best" simple idct compatible idct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 19 Jun 2014 05:50:32 +0000 (02:50 -0300)]
lavf/Makefile: fix standalone compilation of live_flv demuxer
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 19 Jun 2014 05:25:51 +0000 (02:25 -0300)]
configure: fix NASM output format on Win64
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 19 Jun 2014 04:10:43 +0000 (01:10 -0300)]
x86/hevc_idct: fix movd parameter size in DC_ADD_INIT
Fixes compilation with NASM x86_64
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dirk Ausserhaus [Wed, 18 Jun 2014 08:01:52 +0000 (10:01 +0200)]
i263: skip dummy frames
Intel i263 codec has special 8-byte dummy frames that should not be decoded,
so do not even attempt to decode them and skip them instead.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
James Almer [Thu, 19 Jun 2014 04:00:17 +0000 (01:00 -0300)]
x86/blockdsp: move asm code out of dsputil
Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly
changed by commit
2b05db4f8102148d013755ac2a7e47f6d79ff7ca
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 11 Jun 2014 20:15:12 +0000 (22:15 +0200)]
huffyuv: change statistics initialization
Normally, a Laplace distribution is more typical of the residuals
encoded, but for noisy input, it's both better and simpler to be
safe and use a 1/d^2 distribution. Second hunk could use some
renormalization but it has effectively little impact.
Output size of ffvhuff on various 4:2:0 sequences:
context=0,1/d: 851974 27226
1137281
context=0,1/d²: 619081 25069
1051500
context=0,1/d³: 501983 30454
1290561
context=0,lapl: 500650 31754
1304082
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 03:53:41 +0000 (05:53 +0200)]
avcodec/x86/lossless_videodsp: Fix size of values read for left/left_top
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 02:41:48 +0000 (04:41 +0200)]
Merge commit '
e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 '
* commit '
e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 ':
dsputil: Split clear_block*/fill_block* off into a separate context
Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rong Yan [Wed, 18 Jun 2014 08:51:35 +0000 (04:51 -0400)]
ppc: Fix the bug of fft for little endian environment on POWER7 and later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 21:32:48 +0000 (23:32 +0200)]
Merge commit '
869fc416f7c78ed4e397e0208acd1545771c0502 '
* commit '
869fc416f7c78ed4e397e0208acd1545771c0502 ':
hevc: Mark num_bins_in_se as unused
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 21:26:37 +0000 (23:26 +0200)]
Merge commit '
c385313d2590fd26e26bb9bdacddef78162ab490 '
* commit '
c385313d2590fd26e26bb9bdacddef78162ab490 ':
rtsp: Support misordered fmtp rtpmap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 21:22:08 +0000 (23:22 +0200)]
Merge commit '
c9c1e00f95350e7a36b0d05a03939c7f6438e371 '
* commit '
c9c1e00f95350e7a36b0d05a03939c7f6438e371 ':
rtsp: Factor out fmtp parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 21:09:35 +0000 (23:09 +0200)]
Merge commit '
49a242687cf44f86570b706db3c5912ff06bc6c2 '
* commit '
49a242687cf44f86570b706db3c5912ff06bc6c2 ':
doc: Document segment_list_type
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 14 Jan 2014 09:33:47 +0000 (10:33 +0100)]
dsputil: Split clear_block*/fill_block* off into a separate context
Lou Logan [Mon, 9 Jun 2014 20:19:02 +0000 (12:19 -0800)]
doc/bitstream_filters: document imxdump
Partially addresses ticket #3198.
Signed-off-by: Lou Logan <lou@lrcd.com>
Tested-by: Dave Rice <dave@dericed.com>
Luca Barbato [Wed, 18 Jun 2014 14:20:48 +0000 (16:20 +0200)]
hevc: Mark num_bins_in_se as unused
Only its size is actually used. Silence a clang warning.
Joshua Kordani [Tue, 17 Jun 2014 00:49:46 +0000 (02:49 +0200)]
rtsp: Support misordered fmtp rtpmap
Issue present in Avigilon IP cameras.
Luca Barbato [Tue, 17 Jun 2014 00:36:55 +0000 (02:36 +0200)]
rtsp: Factor out fmtp parsing
Luca Barbato [Mon, 16 Jun 2014 11:56:08 +0000 (13:56 +0200)]
doc: Document segment_list_type
Michael Niedermayer [Tue, 10 Jun 2014 15:51:58 +0000 (17:51 +0200)]
ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams
This allows "-codec copy -f framecrc" on files with only unindentifyable streams
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 18:09:55 +0000 (20:09 +0200)]
avformat/mux: simplify ff_choose_timebase()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 17:25:36 +0000 (19:25 +0200)]
dump_stream_format: fix division by 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 16:18:25 +0000 (18:18 +0200)]
Merge commit '
194be1f43ea391eb986732707435176e579265aa '
* commit '
194be1f43ea391eb986732707435176e579265aa ':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 18 Jun 2014 16:37:59 +0000 (18:37 +0200)]
avcodec/ass: move playres parameters below scripttype
Suggested-by: wm4
Clément Bœsch [Wed, 18 Jun 2014 16:12:11 +0000 (18:12 +0200)]
avcodec/ass: explicit PlayRes[XY]
This avoids the following libass warning when using the subtitles
filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288"
Subtitles tests change because the output is ASS and the PlayRes[XY]
ends up in the output.
Michael Niedermayer [Wed, 18 Jun 2014 15:47:12 +0000 (17:47 +0200)]
Merge commit '
d754ed41727b1fcbab335b510248a9758a73320c '
* commit '
d754ed41727b1fcbab335b510248a9758a73320c ':
riffenc: take an AVStream instead of an AVCodecContext
Conflicts:
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)]
Merge commit '
f792d3cbb8e8e35c54a9358a55dd596b7a40f228 '
* commit '
f792d3cbb8e8e35c54a9358a55dd596b7a40f228 ':
lavf: add the notimestamps flag to the muxers missing it
Conflicts:
libavformat/adtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 15:21:28 +0000 (17:21 +0200)]
Merge commit '
cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016 '
* commit '
cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016 ':
rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 15:11:17 +0000 (17:11 +0200)]
Merge commit '
894682a9739eb8d4bfc024b0d4e5757fcfe47378 '
* commit '
894682a9739eb8d4bfc024b0d4e5757fcfe47378 ':
Remove avserver.
Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffserver.conf
doc/ffserver.texi
doc/general.texi
ffserver.c
libavformat/Makefile
libavformat/ffm.h
libavformat/ffmdec.c
libavformat/ffmenc.c
tests/fate/avformat.mak
tests/lavf-regression.sh
tests/ref/lavf/ffm
tests/ref/seek/lavf-ffm
Not merged, ffserver does have a maintainer
co maintainers are welcome and needed though !
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Jun 2014 14:46:56 +0000 (16:46 +0200)]
avcodec/huffyuvdec: do not leave alpha values uninitialized
fixes fate failure under valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 18 May 2014 10:12:59 +0000 (12:12 +0200)]
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Previously, AVStream.codec.time_base was used for that purpose, which
was quite confusing for the callers. This change also opens the path for
removing AVStream.codec.
The change in the lavf-mkv test is due to the native timebase (1/1000)
being used instead of the default one (1/90000), so the packets are now
sent to the crc muxer in the same order in which they are demuxed
(previously some of them got reordered because of inexact timestamp
conversion).