]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 1 Aug 2014 13:38:24 +0000 (15:38 +0200)]
Merge commit '
a786c8259dafeca9744252230b5d78f67810770c '
* commit '
a786c8259dafeca9744252230b5d78f67810770c ':
idct: Split off Xvid IDCT
Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c
This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.
The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)]
Merge commit '
03c9f357a4c2307a7913cea2cbf0ba817e80beb6 '
* commit '
03c9f357a4c2307a7913cea2cbf0ba817e80beb6 ':
ppc: idctdsp: Immediately return if no AltiVec is available
Conflicts:
libavcodec/ppc/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Aug 2014 12:33:16 +0000 (14:33 +0200)]
Merge commit '
706208ef47bffd525c982975d2756f7b2b220b8d '
* commit '
706208ef47bffd525c982975d2756f7b2b220b8d ':
fate: Split fate-pixdesc tests and dispatch them through Make
Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Aug 2014 12:06:42 +0000 (14:06 +0200)]
avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm
The first try failed to work with some build flags
The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.
The workaround is pushed as it may still affect users and does affect one
fate client
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:50:38 +0000 (12:50 +0200)]
Fix standalone compilation of the WebVTT decoder.
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:49:56 +0000 (12:49 +0200)]
Add forgotten APIchanges entry for probesize2.
Update some git hashes.
Benoit Fouet [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]
h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
In order not to break a sequence like "SPS IDR SPS IDR", the boolean
telling that the SPS/PPS has been seen should always be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Thu, 31 Jul 2014 12:32:02 +0000 (14:32 +0200)]
h264: remove useless assignment.
source index, as well as dest one, is unconditionnaly set afterwards,
before being effectively used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 21 Jul 2014 20:13:21 +0000 (13:13 -0700)]
idct: Split off Xvid IDCT
The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files,
so there is no point in having it as an unconditional part of idctdsp.
Diego Biurrun [Thu, 31 Jul 2014 11:48:07 +0000 (04:48 -0700)]
ppc: idctdsp: Immediately return if no AltiVec is available
This is how all the other init functions operate.
Diego Biurrun [Tue, 29 Jul 2014 09:41:28 +0000 (02:41 -0700)]
fate: Split fate-pixdesc tests and dispatch them through Make
This allows running all the tests individually and/or in parallel.
Michael Niedermayer [Fri, 1 Aug 2014 01:36:17 +0000 (03:36 +0200)]
Merge commit '
d98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d '
* commit '
d98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d ':
pgssubdec: Check RLE size before copying
See:
c0d68be555f5858703383040e04fcd6529777061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 01:31:19 +0000 (21:31 -0400)]
pgssubdec: Check RLE size before copying
Make sure the buffer size does not exceed the expected
RLE size.
Prevent an out of array bound write.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Lou Logan [Thu, 31 Jul 2014 22:44:59 +0000 (14:44 -0800)]
doc/indevs: mention required configure options
For x11grab, libcdio, and libdc1394 input devices.
Signed-off-by: Lou Logan <lou@lrcd.com>
James Almer [Tue, 29 Jul 2014 21:07:27 +0000 (18:07 -0300)]
x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}
Cosmetic change. No measurable difference in speed.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 19:01:07 +0000 (21:01 +0200)]
avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue
Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 18:53:15 +0000 (20:53 +0200)]
avfilter/trim: remove duplicate assignment
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 18:44:46 +0000 (20:44 +0200)]
avutil/pixdesc: remove unneeded assignment
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 18:40:10 +0000 (20:40 +0200)]
avcodec/diracdec: remove unneeded assignment
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 18:35:32 +0000 (20:35 +0200)]
avcodec/flac_parser: remove duplicate assignent
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 18:27:19 +0000 (20:27 +0200)]
avcodec/ratecontrol: remove unneeded statement
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 29 Jul 2014 19:23:14 +0000 (21:23 +0200)]
dict.c: minor simplification.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anshul Maheswhwari [Thu, 31 Jul 2014 15:29:59 +0000 (20:59 +0530)]
v4l2enc: adding AVClass
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 14:25:21 +0000 (16:25 +0200)]
libavcodec/h264_parser: Increase parse_history, fix huge resolutions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Thu, 31 Jul 2014 13:32:14 +0000 (15:32 +0200)]
h264_mp4toannexb_bsf: account for consecutive IDR pictures.
If there are consecutive IDR pictures, then SPS/PPS should be prepended
to all of them, not only the first one.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 12:06:12 +0000 (14:06 +0200)]
avcodec/dvdsubdec: free subtitle rectangles if nothing is output
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 11:04:28 +0000 (13:04 +0200)]
avcodec/resample: check for malloc failure
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 10:55:41 +0000 (12:55 +0200)]
avcodec/pthread_slice: Check for malloc failure
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jul 2014 03:20:42 +0000 (05:20 +0200)]
avcodec/mpeg4video_parser: Check for extradata parsing failure
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gerion Entrup [Tue, 29 Jul 2014 23:53:32 +0000 (01:53 +0200)]
doc: add very basic libcdio documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: add some empty lines to make the code easier to read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: rename some identifers to make the code easier to read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: Add some comments to make the code easier to read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jul 2014 21:34:18 +0000 (23:34 +0200)]
Merge commit '
a0ce85ac7de098d3f9b53b51b77a09bad700a011 '
* commit '
a0ce85ac7de098d3f9b53b51b77a09bad700a011 ':
configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 30 Jul 2014 12:10:18 +0000 (05:10 -0700)]
configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled
Reimar Döffinger [Tue, 29 Jul 2014 19:13:10 +0000 (21:13 +0200)]
movdec: remove nonsensical snprintf.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 29 Jul 2014 18:17:28 +0000 (20:17 +0200)]
mxfdec: add missing "const" to array declaration.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Wed, 29 Jan 2014 23:54:36 +0000 (00:54 +0100)]
ffprobe: print some basic information about avframe side data
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 23:09:06 +0000 (01:09 +0200)]
avutil/frame: add av_frame_side_data_name()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jul 2014 15:50:35 +0000 (17:50 +0200)]
avfilter/f_select: avoid double->int in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jul 2014 15:48:33 +0000 (17:48 +0200)]
avfilter/f_select: Set var_values[VAR_KEY] correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jul 2014 15:37:09 +0000 (17:37 +0200)]
avfilter/f_select: avoid using doubles for equals checks and casts to enums
This might silence some warnings.
Issue found from:
a8d803a320fb08b3ad5db4fffc79abd401206905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)]
Merge commit '
a8d803a320fb08b3ad5db4fffc79abd401206905 '
* commit '
a8d803a320fb08b3ad5db4fffc79abd401206905 ':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
Not merged, see next commit for the bugfix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Fri, 18 Jul 2014 08:34:39 +0000 (10:34 +0200)]
ffmpeg_filter: refuse to configure input without a decoder.
The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).
Enhance trac ticket #3779.
Carl Eugen Hoyos [Wed, 30 Jul 2014 09:09:25 +0000 (11:09 +0200)]
Add int64_t probesize2 instead of int probesize to AVFormatContext.
Allows to set a probesize >2G.
Tested-by: Oliver Fromme
Carl Eugen Hoyos [Wed, 30 Jul 2014 09:03:29 +0000 (11:03 +0200)]
lavf/mux: Fix a typo checking aspect ratios.
Fixes ticket #3813.
gerion.entrup@t-online.de [Wed, 30 Jul 2014 02:19:15 +0000 (04:19 +0200)]
avformat/movenc: add m4b to list of ipod playable files
m4b is the extension used by iDevices to detect audiobooks.
Christophe Gisquet [Mon, 28 Jul 2014 09:48:21 +0000 (11:48 +0200)]
x86: hevc_mc: fix register count usage
A macro was using a fixed register, causing too many GPRs to be
declared as used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:38:15 +0000 (21:38 +0200)]
avformat/format: fix memleak and error code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:35:07 +0000 (21:35 +0200)]
avformat/format.c: remove duplicate include, put libavutil includes together
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:33:10 +0000 (21:33 +0200)]
avformat/format: simplify ifdeffery
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:26:27 +0000 (21:26 +0200)]
Merge commit '
ccbf370f2000b9b27f4af259c23007d67f7ea46e '
* commit '
ccbf370f2000b9b27f4af259c23007d67f7ea46e ':
mpegvideo: move vol_control_parameters to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:17:41 +0000 (21:17 +0200)]
Merge commit '
fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a '
* commit '
fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a ':
matroska: Register mime types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:11:03 +0000 (21:11 +0200)]
Merge commit '
02cf0c9e42967de1e4d2803bee3573bc5b735fdd '
* commit '
02cf0c9e42967de1e4d2803bee3573bc5b735fdd ':
aac: Register the mime type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 19:02:48 +0000 (21:02 +0200)]
avformat: fix probe mime version checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 18:57:42 +0000 (20:57 +0200)]
Merge commit '
3a19405d574a467c68b48e4b824c76617fd59de0 '
* commit '
3a19405d574a467c68b48e4b824c76617fd59de0 ':
avformat: Use the mime type information in input probe
Conflicts:
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 18:09:15 +0000 (20:09 +0200)]
Merge commit '
69e7336b8e16ee65226fc20381baf537f4b125e6 '
* commit '
69e7336b8e16ee65226fc20381baf537f4b125e6 ':
avstring: Expose the simple name match function
Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jul 2014 17:55:15 +0000 (19:55 +0200)]
Merge commit '
e253a9e2b3d683eb51db7c776326eb07de10ad4c '
* commit '
e253a9e2b3d683eb51db7c776326eb07de10ad4c ':
avformat: Move av_probe_input* to format.c
Conflicts:
libavformat/format.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 29 Jul 2014 12:43:04 +0000 (05:43 -0700)]
vf_select: Drop a debug av_log with an unchecked double to enum conversion
CC: libav-stable@libav.org
Nidhi Makhijani [Tue, 29 Jul 2014 15:54:29 +0000 (21:24 +0530)]
mpegvideo: move vol_control_parameters to the only place it is used
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Luca Barbato [Thu, 13 Mar 2014 21:14:43 +0000 (22:14 +0100)]
matroska: Register mime types
Luca Barbato [Thu, 13 Mar 2014 21:12:18 +0000 (22:12 +0100)]
aac: Register the mime type
Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
Luca Barbato [Thu, 13 Mar 2014 21:11:12 +0000 (22:11 +0100)]
avformat: Use the mime type information in input probe
It should provide a quicker guess for elementary streams provided
by http.
Luca Barbato [Tue, 29 Jul 2014 13:29:13 +0000 (14:29 +0100)]
avstring: Expose the simple name match function
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Nicolas Martyanoff [Tue, 29 Jul 2014 14:24:11 +0000 (16:24 +0200)]
avformat/hlsenc: fix cleanup after avformat_write_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 13 Mar 2014 18:54:00 +0000 (19:54 +0100)]
avformat: Move av_probe_input* to format.c
James Almer [Tue, 29 Jul 2014 07:30:13 +0000 (04:30 -0300)]
x86/hevc_deblock: add add ff_hevc_[hv]_loop_filter_luma_{8, 10, 12}_avx
~5% faster than SSSE3
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 29 Jul 2014 07:30:12 +0000 (04:30 -0300)]
x86/hevc_deblock: improve luma functions register allocation
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 29 Jul 2014 07:30:11 +0000 (04:30 -0300)]
x86/hevc_deblock: remove some unnecessary instructions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 26 Jul 2014 19:40:53 +0000 (21:40 +0200)]
hevc_filter: run vertical and horizontal together
This should help cache locality. On win64:
Before: 1397x cycles, 16216 bytes
After: 1369x cycles, 16040 bytes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 29 Jul 2014 00:11:49 +0000 (21:11 -0300)]
x86/hevc_deblock: use psignw instead of pmullw where possible
It's slightly faster
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 23:32:48 +0000 (01:32 +0200)]
Merge commit '
942269fd00cb48328e4cffb6e21a0b691ce9f6bc '
* commit '
942269fd00cb48328e4cffb6e21a0b691ce9f6bc ':
caf: Use correct printf conversion specifiers for POSIX int types
Conflicts:
libavformat/cafdec.c
See:
1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 23:22:05 +0000 (01:22 +0200)]
Merge commit '
019a28cd630286ecb2b06ee62025a17c821b493e '
* commit '
019a28cd630286ecb2b06ee62025a17c821b493e ':
sanm: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:40:00 +0000 (00:40 +0200)]
Merge commit '
59ca29a560ba0cfe97457de8cedf77db434f0de4 '
* commit '
59ca29a560ba0cfe97457de8cedf77db434f0de4 ':
dump: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)]
Merge commit '
4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d '
* commit '
4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d ':
x86: build: Restore ordering of OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:27:45 +0000 (00:27 +0200)]
Merge commit '
e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0 '
* commit '
e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0 ':
configure: Use require_pkg_config for Speex
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:17:58 +0000 (00:17 +0200)]
Merge commit '
259fe7280d0b63dc7a8ff017d44f26d3a84cfde8 '
* commit '
259fe7280d0b63dc7a8ff017d44f26d3a84cfde8 ':
mxf: Extract origin information from material and source track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:11:46 +0000 (00:11 +0200)]
Merge commit '
c9d982aa11a6267611c3770792f0e04b48438348 '
* commit '
c9d982aa11a6267611c3770792f0e04b48438348 ':
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 22:01:25 +0000 (00:01 +0200)]
Merge commit '
dc71f1958846bb1d96de43a4603983dc8450cfcc '
* commit '
dc71f1958846bb1d96de43a4603983dc8450cfcc ':
video4linux2: Avoid a floating point exception
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 28 Jul 2014 21:25:54 +0000 (23:25 +0200)]
Fix standalone compilation of the adts muxer.
Diego Biurrun [Mon, 28 Jul 2014 16:21:57 +0000 (09:21 -0700)]
caf: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Sat, 26 Jul 2014 12:12:48 +0000 (05:12 -0700)]
sanm: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Sat, 26 Jul 2014 12:11:18 +0000 (05:11 -0700)]
dump: Use correct printf conversion specifiers for POSIX int types
Diego Biurrun [Sat, 26 Jul 2014 22:04:44 +0000 (15:04 -0700)]
x86: build: Restore ordering of OBJS lines
Luca Barbato [Thu, 24 Jul 2014 21:50:38 +0000 (23:50 +0200)]
configure: Use require_pkg_config for Speex
Distributors and integrators nowadays have less problems by leveraging
pkg-config files than having to set custom CFLAGS and LDFLAGS.
Marc-Antoine Arnaud [Tue, 22 Jul 2014 16:08:04 +0000 (18:08 +0200)]
mxf: Extract origin information from material and source track
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Marc-Antoine Arnaud [Tue, 22 Jul 2014 14:08:52 +0000 (16:08 +0200)]
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Bernhard Übelacker [Sun, 27 Jul 2014 15:38:59 +0000 (08:38 -0700)]
video4linux2: Avoid a floating point exception
This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.
James Almer [Mon, 28 Jul 2014 19:17:35 +0000 (16:17 -0300)]
x86/hevc_deblock: load less data in hevc_h_loop_filter_luma_8
Reading 8 bytes is enough.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 28 Jul 2014 19:17:34 +0000 (16:17 -0300)]
x86/hevc_idct: add a colon to labels
This fixes a warning spam when using NASM
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 18:06:11 +0000 (20:06 +0200)]
avdevice/pulse_audio_enc: use getter function for AVFrame.channels
This is required by the API/ABI for things outside libavutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 16:27:17 +0000 (18:27 +0200)]
tests/fate.sh: If cat *.rep fails try it with a for loop.
Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.
Also the plain cat is left in place as it is faster than the loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 00:40:35 +0000 (02:40 +0200)]
version.sh: Print versions based on the last git tag for release branches
release branches are detected by checking if "git" is not in RELEASE
This changes "
N-64706-g2f71aeb " to "
n2.3-8-g2f71aeb "
for git master theres no change
This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
ee606fd0317df202b59946cf9b738c0a01056316 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 12:34:47 +0000 (14:34 +0200)]
avcodec/hevc: fix "discards const qualifier from pointer target type" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 12:28:56 +0000 (14:28 +0200)]
avcodec/hevc: add some const to cbf arrays
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Sun, 27 Jul 2014 22:48:06 +0000 (00:48 +0200)]
hevc: clean up non relevant TODO
cherry picked from commit
a2ef95f043d89d05482af19460c9e9afdadec685
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 27 Jul 2014 23:06:32 +0000 (01:06 +0200)]
hevc: rename variable in boundary strength to b more explicit
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit
348bebedc0012aae201419669fca1eb61ec93ca6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 12:02:03 +0000 (14:02 +0200)]
Merge commit '
e76f2d11970484266e67a12961f2339a5c2fccf9 '
* commit '
e76f2d11970484266e67a12961f2339a5c2fccf9 ':
hevc: eliminate the last element from TransformTree
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 11:35:51 +0000 (13:35 +0200)]
Merge commit '
4aa80808bcc2a30fcd7ce5b38594319df3a85b36 '
* commit '
4aa80808bcc2a30fcd7ce5b38594319df3a85b36 ':
hevc: eliminate unnecessary cbf_c{b,r} arrays
Conflicts:
libavcodec/hevc.c
See:
77ef9fd1e938010600620c1d32cabd15e7d5b853
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jul 2014 11:09:00 +0000 (13:09 +0200)]
Merge commit '
0daa2554636ba1d31f3162ffb86991e84eb938a8 '
* commit '
0daa2554636ba1d31f3162ffb86991e84eb938a8 ':
hevc: do not store the transform inter_split flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>