]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 15 Feb 2015 20:49:57 +0000 (21:49 +0100)]
Merge commit '
51ca3cb604a7585a7cff35d4b954794508955c19 '
* commit '
51ca3cb604a7585a7cff35d4b954794508955c19 ':
xcbgrab: Use the correct geometry for the region highlight
See:
0ae37e460c345a4c76e28256af56931e00c94cb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 20:41:46 +0000 (21:41 +0100)]
Merge commit '
e1a57cbb1c2752feb9315f748836dc44e58d2dc6 '
* commit '
e1a57cbb1c2752feb9315f748836dc44e58d2dc6 ':
ape: Use the proper variable type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 20:31:13 +0000 (21:31 +0100)]
Merge commit '
b4cda0a999facbddacb95861a67ff61074edc39b '
* commit '
b4cda0a999facbddacb95861a67ff61074edc39b ':
ogg: check memory allocations
Conflicts:
libavformat/oggenc.c
See:
0f629823355680802320ee7be52af7f4e1b3e0b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 20:20:25 +0000 (21:20 +0100)]
Merge commit '
53367b34e1156614e82ef7af888928f322566f88 '
* commit '
53367b34e1156614e82ef7af888928f322566f88 ':
rtp: h264: Drop the asserts
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 20:09:43 +0000 (21:09 +0100)]
Merge commit '
3b33dfb23c5022a0cb2a7b13878e4a3492a996c7 '
* commit '
3b33dfb23c5022a0cb2a7b13878e4a3492a996c7 ':
rtp: h264: Move FU-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 20:03:43 +0000 (21:03 +0100)]
Merge commit '
f0a87479960ce000f23f2beaf474707797b4b0d0 '
* commit '
f0a87479960ce000f23f2beaf474707797b4b0d0 ':
rtp: h264: Move STAP-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:57:45 +0000 (20:57 +0100)]
Merge commit '
a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b '
* commit '
a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b ':
rtp: h264: Move parse_sprop_parameter_sets parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:49:16 +0000 (20:49 +0100)]
Merge commit '
b8df0b71c525e9fc9fbee790d093bae3aa62035c '
* commit '
b8df0b71c525e9fc9fbee790d093bae3aa62035c ':
rtp: h264: Move profile_level_id parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:42:13 +0000 (20:42 +0100)]
Merge commit '
d40815a982c36ff9da09ae3edb5e3bd7d97b5d42 '
* commit '
d40815a982c36ff9da09ae3edb5e3bd7d97b5d42 ':
xcbgrab: Correctly make shm optional
Conflicts:
libavdevice/xcbgrab.c
See:
8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:38:34 +0000 (20:38 +0100)]
Merge commit '
c23ccaf98827cffa651cec3bfa5e57457dfc9dff '
* commit '
c23ccaf98827cffa651cec3bfa5e57457dfc9dff ':
xcbgrab: Check for xcb-shape
Conflicts:
configure
See:
792f0f20456cc24f1f1b9ee445e50737d65e38df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:21:10 +0000 (20:21 +0100)]
Merge commit '
e21d85309943a51b7808f5e01dd258b262e09148 '
* commit '
e21d85309943a51b7808f5e01dd258b262e09148 ':
FATE: add a test for the SVQ1 header byte swapping
Conflicts:
tests/fate/qt.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 19:08:21 +0000 (20:08 +0100)]
Merge commit '
d3449ac938333d59955360b6cb8e7bc24a9b792e '
* commit '
d3449ac938333d59955360b6cb8e7bc24a9b792e ':
changelog: mention DXVA/HEVC and AAC ELD480
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 18:51:05 +0000 (19:51 +0100)]
avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"
Found-by: Loriker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Sun, 15 Feb 2015 16:20:32 +0000 (17:20 +0100)]
avformat/rtpdec: DV depacketizer (RFC 6469)
Tested with live555 RTSP server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:58:47 +0000 (14:58 -0300)]
ffserver: fix wrong indentation
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:54:34 +0000 (14:54 -0300)]
ffserver: decouple assignment and check
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:47:54 +0000 (14:47 -0300)]
ffserver: break too-long lines
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 16:23:06 +0000 (13:23 -0300)]
ffserver: reorder HTTP fwd decls
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Daniel Moran [Wed, 4 Feb 2015 03:57:49 +0000 (22:57 -0500)]
xcbgrab: Use the correct geometry for the region highlight
The feature is implemented using a transparent window and drawing
inside it a rectangle filling the whole window to highlight it.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 14 Feb 2015 15:15:37 +0000 (16:15 +0100)]
ape: Use the proper variable type
Avoid an unsigned underflow.
Bug-Id:
1041122
CC: libav-stable@libav.org
Federico Tomassetti [Sat, 14 Feb 2015 16:14:51 +0000 (16:14 +0000)]
ogg: check memory allocations
Bug-Id: CID
1257795
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 14 Feb 2015 00:45:31 +0000 (01:45 +0100)]
rtp: h264: Drop the asserts
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move FU-A NAL parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move STAP-A NAL parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move parse_sprop_parameter_sets parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move profile_level_id parsing to a function
Luca Barbato [Tue, 25 Nov 2014 22:38:43 +0000 (23:38 +0100)]
xcbgrab: Correctly make shm optional
The segment field in the struct has to be conditionally build
as well.
Luca Barbato [Tue, 25 Nov 2014 22:38:17 +0000 (23:38 +0100)]
xcbgrab: Check for xcb-shape
It is required.
James Almer [Sun, 15 Feb 2015 16:57:02 +0000 (13:57 -0300)]
x86/swr: make pack_8ch functions work with compilers without aligned stack
Signed-off-by: James Almer <jamrial@gmail.com>
zhaoxiu.zeng [Sat, 14 Feb 2015 14:45:49 +0000 (22:45 +0800)]
avcodec/vc1: cleanup and simplification
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 12 Feb 2015 20:00:04 +0000 (21:00 +0100)]
FATE: add a test for the SVQ1 header byte swapping
Anton Khirnov [Thu, 12 Feb 2015 20:10:19 +0000 (21:10 +0100)]
changelog: mention DXVA/HEVC and AAC ELD480
Thomas Volkert [Sun, 15 Feb 2015 13:46:42 +0000 (14:46 +0100)]
rtpdec: experimental VP9 depacketizer (draft 0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sun, 15 Feb 2015 09:54:01 +0000 (15:24 +0530)]
ffmpeg_opt: Creating new data stream for output format context
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
if input codec Id match with expected data stream of output format context
then only new stream with same codec id is created.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 10:35:40 +0000 (11:35 +0100)]
avcodec/dcadec: Move remaining tables to dcadata.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 00:53:21 +0000 (01:53 +0100)]
avfilter/vsrc_mandelbrot: fix indention of mis-indented block
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Zhaoxiu Zeng [Fri, 13 Feb 2015 05:51:30 +0000 (13:51 +0800)]
avcodec/h264: use avpriv_find_start_code() in h264_split()
This also allows replacing several literal numbers by named constants
And it should be faster, the function is not speed relevant though as it is
generally only called a few times at the streams start.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 15:20:58 +0000 (16:20 +0100)]
avformat/matroskaenc: add allow_raw_vfw and disable it by default
Based on complaint by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 23:22:46 +0000 (00:22 +0100)]
avutil/fixed_dsp: Use av_clip_int16() instead of the non optimized av_clip_int16_c()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:51:27 +0000 (22:51 +0100)]
Merge commit '
ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f '
* commit '
ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f ':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:46:31 +0000 (22:46 +0100)]
Merge commit '
36cf8eb4489f8709b5fb1cdb87e125ef53301c2f '
* commit '
36cf8eb4489f8709b5fb1cdb87e125ef53301c2f ':
mov: Fix compilation with DEBUG enabled
See:
349a32c436d9511fe786c761cc2728f5b5efea0e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:40:35 +0000 (22:40 +0100)]
Merge commit '
2a9c6fae927964b5dd0b5d3d9292f5621bd21664 '
* commit '
2a9c6fae927964b5dd0b5d3d9292f5621bd21664 ':
dca: Move all tables into dcadata.h
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:31:53 +0000 (22:31 +0100)]
Merge commit '
8a213179aff0174d81b3e889134a3b4f7d21f5c3 '
* commit '
8a213179aff0174d81b3e889134a3b4f7d21f5c3 ':
dca: Remove trace debugging code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:25:48 +0000 (22:25 +0100)]
Merge commit '
a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa '
* commit '
a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa ':
dca: Return more informative error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 21:12:56 +0000 (22:12 +0100)]
avcodec/dcaenc: rename DCA_SUBBANDS
Fixes "warning: DCA_SUBBANDS redefined"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 20:48:32 +0000 (21:48 +0100)]
Merge commit '
b339019de4e5f4d3c661bbdba98ae248ab77e2f0 '
* commit '
b339019de4e5f4d3c661bbdba98ae248ab77e2f0 ':
dca: Split code for handling the EXSS extension off into a separate file
Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 20:27:26 +0000 (21:27 +0100)]
Merge commit '
bf704132a51f5d838365158331d4e535e1df4c8e '
* commit '
bf704132a51f5d838365158331d4e535e1df4c8e ':
Don't anonymously typedef structs
Conflicts:
avprobe.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 20:18:17 +0000 (21:18 +0100)]
Merge commit '
7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 '
* commit '
7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0 ':
avcodec: Don't anonymously typedef structs
Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 20:07:40 +0000 (21:07 +0100)]
Merge commit '
daf8cf358a098a903d59adb6c0d0cc3262a8c93e '
* commit '
daf8cf358a098a903d59adb6c0d0cc3262a8c93e ':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 25 Jan 2015 18:18:59 +0000 (19:18 +0100)]
avfilter: bump minor and Changelog document the new filters
Clément Bœsch [Sat, 24 Jan 2015 20:38:15 +0000 (21:38 +0100)]
avfilter: add paletteuse filter
Clément Bœsch [Sat, 24 Jan 2015 20:37:59 +0000 (21:37 +0100)]
avfilter: add palettegen filter
Clément Bœsch [Sat, 24 Jan 2015 20:36:47 +0000 (21:36 +0100)]
avcodec/gif: support crop and transparency with PAL8
Clément Bœsch [Fri, 23 Jan 2015 15:34:14 +0000 (16:34 +0100)]
avformat/gif: use first packet palette as global for PAL8
This will allow the payload in PAL8 packets to not contain 768B of local
palette (which is not LZW compressed).
Clément Bœsch [Sat, 24 Jan 2015 15:01:39 +0000 (16:01 +0100)]
avformat/gif: simplify gif_image_write_header() prototype
Paul B Mahol [Sat, 14 Feb 2015 14:21:30 +0000 (14:21 +0000)]
avcodec/dxtory: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 14 Feb 2015 19:29:34 +0000 (20:29 +0100)]
Merge commit '
7769be590c7aeb2aad26ca723d105cf5203e33d2 '
* commit '
7769be590c7aeb2aad26ca723d105cf5203e33d2 ':
vp56: Return meaningful error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Fri, 13 Feb 2015 21:51:34 +0000 (22:51 +0100)]
avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 5 Feb 2015 16:39:44 +0000 (17:39 +0100)]
vdpau: Adjust necessary #includes for vdpau_internal.h
Diego Biurrun [Fri, 6 Feb 2015 11:03:46 +0000 (12:03 +0100)]
mov: Fix compilation with DEBUG enabled
Gilles Chanteperdrix [Fri, 13 Feb 2015 21:51:33 +0000 (22:51 +0100)]
avformat/rtpdec_mpeg12: add robust MPEG audio depacketization (RFC 5219)
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Fri, 13 Feb 2015 21:51:33 +0000 (22:51 +0100)]
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 22 Sep 2014 16:05:40 +0000 (18:05 +0200)]
dca: Move all tables into dcadata.h
Diego Biurrun [Mon, 22 Sep 2014 09:37:34 +0000 (11:37 +0200)]
dca: Remove trace debugging code
Diego Biurrun [Mon, 22 Sep 2014 09:24:07 +0000 (11:24 +0200)]
dca: Return more informative error codes
Diego Biurrun [Mon, 22 Sep 2014 05:36:08 +0000 (07:36 +0200)]
dca: Split code for handling the EXSS extension off into a separate file
Diego Biurrun [Mon, 22 Sep 2014 09:02:13 +0000 (11:02 +0200)]
Don't anonymously typedef structs
Diego Biurrun [Mon, 22 Sep 2014 09:01:31 +0000 (11:01 +0200)]
avcodec: Don't anonymously typedef structs
Diego Biurrun [Mon, 22 Sep 2014 07:19:33 +0000 (09:19 +0200)]
avformat: Don't anonymously typedef structs
Himangi Saraogi [Fri, 13 Feb 2015 18:40:49 +0000 (00:10 +0530)]
vp56: Return meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Christophe Gisquet [Thu, 5 Feb 2015 11:37:52 +0000 (12:37 +0100)]
x86: hevc: remove a parameter to WP internals
The second stride is always the internal buffer one, MAX_PB_SIZE (times 2 to
get the value in bytes).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Sat, 14 Feb 2015 15:03:13 +0000 (23:03 +0800)]
avcodec/vc1_pred: few branchless optimizations
This is also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Zhaoxiu Zeng [Fri, 13 Feb 2015 05:50:23 +0000 (13:50 +0800)]
avcodec/parser: optimize ff_mpeg4video_split()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 10 Feb 2015 12:13:53 +0000 (12:13 +0000)]
lavc: deprecate VIMA decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 14 Feb 2015 11:47:35 +0000 (12:47 +0100)]
avformat/matroskaenc: Do not use native mode for raw RGB
This fixes generating totally unplayable files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 11:43:33 +0000 (12:43 +0100)]
avformat/matroskaenc: fix handling of VFW style raw rgb
raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Feb 2015 10:58:01 +0000 (11:58 +0100)]
avformat/mov: print a warning if parsing udta failed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:56:28 +0000 (00:56 +0800)]
avcodec/apedec: simplify sign conversion
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:58:58 +0000 (00:58 +0800)]
avcodec/golomb: simplify sign conversion
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:55:34 +0000 (00:55 +0800)]
avcodec/apedec: move 'coeffs[256] and delay[256]' into, long_filter_high_3800
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:53:12 +0000 (00:53 +0800)]
avcodec/wmalosslessdec: simplify
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:51:27 +0000 (00:51 +0800)]
avcodec/wmalosslessdec: optimize sign operation
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Fri, 13 Feb 2015 16:49:49 +0000 (00:49 +0800)]
avcodec/wmalosslessdec: change type of acfilter_coeffs from int64_t to int16_t
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Thu, 12 Feb 2015 16:05:36 +0000 (00:05 +0800)]
avcodec/wmv2: simplify cbp_table_index calculation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Thu, 12 Feb 2015 16:03:21 +0000 (00:03 +0800)]
avcodec/vc1: simplify vc1_split()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Thu, 12 Feb 2015 16:02:04 +0000 (00:02 +0800)]
avcodec/vc1: simplify find_next_marker()
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Feb 2015 11:32:30 +0000 (12:32 +0100)]
Merge commit '
eea769df322fac2601a96db195fa7dc8d12a8fbc '
* commit '
eea769df322fac2601a96db195fa7dc8d12a8fbc ':
hevc: Use generic av_clip function, not C implementation
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
See:
83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Feb 2015 10:51:25 +0000 (11:51 +0100)]
Merge commit '
faa8ffda2c513573733624784f0a7d0a4959d33e '
* commit '
faa8ffda2c513573733624784f0a7d0a4959d33e ':
doc/APIchanges: fill in missing dates and hashes
Conflicts:
doc/APIchanges
See:
c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See:
8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 12 Feb 2015 18:17:17 +0000 (18:17 +0000)]
fate: add wavpack encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Peter Meerwald [Mon, 9 Feb 2015 09:44:24 +0000 (10:44 +0100)]
hevc: Use generic av_clip function, not C implementation
hevc seems to be the only place where the C implementation
of the av_clip function is explicitly selected, precluding
platform-specific optimizations
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 12 Feb 2015 20:20:46 +0000 (21:20 +0100)]
doc/APIchanges: fill in missing dates and hashes
Also, move a misplaced block to the right position.
Michael Niedermayer [Fri, 13 Feb 2015 03:20:55 +0000 (04:20 +0100)]
avformat/mov: Heuristically detect raw udta
Fixes tkhd+moov fragment provided by koda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sun, 8 Feb 2015 21:22:45 +0000 (22:22 +0100)]
avformat/rtsp: parse lang attribute in SDP
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sun, 8 Feb 2015 21:22:41 +0000 (22:22 +0100)]
avformat/rtpdec: add T.140 RTP depacketization (RFC 4103)
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sun, 8 Feb 2015 21:22:40 +0000 (22:22 +0100)]
avformat/rtsp: allow receiving subtitles via RTP
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Feb 2015 21:31:47 +0000 (22:31 +0100)]
avformat/mpegtsenc: Do not create invalid files from annex b streams without SPS/PPS
use global headers to create SPS/PPS when they are available
Fixes Ticket4248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Thu, 12 Feb 2015 19:41:39 +0000 (20:41 +0100)]
rtpdec_hevc: correct parsing of aggregated packets
reported by tim dot yao at amlogic dot com
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 12 Feb 2015 06:11:37 +0000 (03:11 -0300)]
x86/hevc_mc: optimize AVX2 mc functions
Before
40766 decicycles in ff_hevc_put_hevc_qpel_h64_8_avx2, 8192 runs, 0 skips
After
37975 decicycles in ff_hevc_put_hevc_qpel_h64_8_avx2, 8192 runs, 0 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 10 Feb 2015 02:18:32 +0000 (23:18 -0300)]
x86/hevc_sao: make sao_edge_filter_{10,12} work on x86_32
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
wm4 [Mon, 9 Feb 2015 19:39:01 +0000 (20:39 +0100)]
avformat/matroskadec: fix IGNIDX handling
Just because the user requested the seek index to be ignored, we can't
just skip essential headers. At least tags are often located at the end
of the file, and the old code simply ignored the seekhead for all
elements, not just the cue index. Also, it looks like it used the index
even if IGNIDX was set if the cue index was located in the beginning of
the file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>