Anshul Maheshwari [Tue, 8 Apr 2014 10:01:29 +0000 (15:31 +0530)]
rtspcodes: don't check for >0 on error codes macro
Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit
superfluous (At least gcc 4.8 didnt consider this been
a problem).
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Schenk, Michael [Tue, 8 Apr 2014 15:08:41 +0000 (15:08 +0000)]
configure: AVI demux needs exif
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 17:09:05 +0000 (19:09 +0200)]
swscale/swscale_internal: remove obsolete warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 16:51:34 +0000 (18:51 +0200)]
swscale/swscale_internal: make the offset strings update themselfs when the MAX_FILTER_SIZE is changed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 16:12:12 +0000 (18:12 +0200)]
swscale/x86/swscale_template: loose hardcoded dstw_offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 14:18:29 +0000 (16:18 +0200)]
vcodec/bitstream: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 14:17:40 +0000 (16:17 +0200)]
avcodec/avpacket: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 14:15:32 +0000 (16:15 +0200)]
avcodec/a64multienc: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 13:44:32 +0000 (15:44 +0200)]
cmdutils: use av_mallocz_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 13:35:47 +0000 (15:35 +0200)]
avcodec/ac3enc_float: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 13:35:14 +0000 (15:35 +0200)]
examples/transcoding: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Apr 2014 00:28:58 +0000 (02:28 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --disable-everything --enable-decoder=rawvideo.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 23:25:00 +0000 (01:25 +0200)]
avfilter/vf_colormatrix: fix memleak on error
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 22:29:26 +0000 (00:29 +0200)]
swresample/resample: use av_malloc_array() where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 22:29:06 +0000 (00:29 +0200)]
swresample/dither: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 22:19:07 +0000 (00:19 +0200)]
swresample/resample: Limit filter length
Related to CID1197063
The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 7 Apr 2014 22:04:25 +0000 (00:04 +0200)]
Fix compilation with --disable-everything --enable-decoder=rawvideo.
Michael Niedermayer [Mon, 7 Apr 2014 18:19:30 +0000 (20:19 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: fix missing end of line character
Conflicts:
libavcodec/libxvid.c
No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 7 Apr 2014 09:10:05 +0000 (11:10 +0200)]
Fix standalone compilation of vp7 and vp8 decoder.
Fixes ticket #3536.
Carl Eugen Hoyos [Mon, 7 Apr 2014 08:39:55 +0000 (10:39 +0200)]
Read aspect ratio from tiff image files.
Vittorio Giovara [Mon, 7 Apr 2014 12:56:25 +0000 (14:56 +0200)]
libxvid: fix missing end of line character
Error introduced in
5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.
Schenk, Michael [Mon, 7 Apr 2014 12:48:13 +0000 (14:48 +0200)]
avformat/oggdec: reset nstreams in close
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Schenk, Michael [Mon, 7 Apr 2014 12:48:13 +0000 (14:48 +0200)]
avformat/mov: reset drefs_count in close
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Mon, 7 Apr 2014 03:25:28 +0000 (13:25 +1000)]
Remove leal op to fix icl inline asm.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Mon, 7 Apr 2014 02:21:42 +0000 (23:21 -0300)]
ffserver: don't hardcode RTSP status codes
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 7 Apr 2014 02:20:02 +0000 (23:20 -0300)]
rtspcodes: add full list of RTSP status codes
Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt
and macro to translate.
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 7 Apr 2014 00:09:57 +0000 (21:09 -0300)]
ffserver: nits & typos
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Thilo Borgmann [Sun, 6 Apr 2014 21:17:08 +0000 (23:17 +0200)]
configure: Check for generated output in check_header_oc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 02:18:21 +0000 (04:18 +0200)]
avcodec/h264/find_start_code: factorize addition out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 02:16:17 +0000 (04:16 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xtea: Add Doxy @file and group
See:
50f52a5498ff02c997d16b8181f32b933ce94b6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 02:04:19 +0000 (04:04 +0200)]
Merge commit '
f73495686d109ffffaa8c0387e790e7997326229'
* commit '
f73495686d109ffffaa8c0387e790e7997326229':
adler32: Fix doxy group definition
See:
624672fcce84c41e9e2fe9ff3ec3fd56140b175f and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 01:36:48 +0000 (03:36 +0200)]
Merge commit '
e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
* commit '
e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
h264: Refactor decode_nal_units
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 01:19:41 +0000 (03:19 +0200)]
Merge commit '
c389a804943095ebf078daec6b64690d2c97069c'
* commit '
c389a804943095ebf078daec6b64690d2c97069c':
libxvid: Add SSIM displaying through a libxvidcore plugin
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See:
3b3c1ed0768af874c624cc555fbbd1fcea370200
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 01:07:49 +0000 (03:07 +0200)]
Merge commit '
5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
* commit '
5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
libxvid: add working lumimasking and variance AQ
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See:
ccb212b6c3ed18c9ff4e0c982574c43f92657f9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 00:50:46 +0000 (02:50 +0200)]
Merge commit '
d3789eeeed3423bd1ca9dc40030a2f7a21ea5332'
* commit '
d3789eeeed3423bd1ca9dc40030a2f7a21ea5332':
aarch64: implement videodsp.prefetch
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Apr 2014 00:15:09 +0000 (02:15 +0200)]
Merge commit '
8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'
* commit '
8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14':
aarch64: add armv8 CPU flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Hilb [Sun, 6 Apr 2014 19:06:05 +0000 (21:06 +0200)]
lavc/cpia: use avpriv_report_missing_feature()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Hilb [Sun, 6 Apr 2014 19:06:04 +0000 (21:06 +0200)]
lavc/cpia: fix typo in log message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 2 Nov 2013 22:03:30 +0000 (15:03 -0700)]
xtea: Add Doxy @file and group
Timothy Gu [Fri, 14 Jun 2013 08:42:55 +0000 (05:42 -0300)]
adler32: Fix doxy group definition
Based on a patch by James Almer <jamrial@gmail.com>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Sun, 6 Apr 2014 21:57:37 +0000 (23:57 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Set Matroska private data when muxing Prores.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 21:38:30 +0000 (23:38 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add tests for SANM and VIMA
Conflicts:
tests/fate/video.mak
tests/ref/fate/sanm
See:
4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 6 Apr 2014 18:54:48 +0000 (20:54 +0200)]
Set Matroska private data when muxing Prores.
The specification requires the mov code point to be written as "fourcc".
Luca Barbato [Sat, 5 Apr 2014 00:41:12 +0000 (00:41 +0000)]
h264: Refactor decode_nal_units
Michael Niedermayer [Sun, 6 Apr 2014 21:24:21 +0000 (23:24 +0200)]
Merge commit '
eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'
* commit '
eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
LucasArts SMUSH demuxer
Conflicts:
Changelog
doc/general.texi
libavformat/smush.c
libavformat/version.h
See:
bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 31 Jul 2013 02:40:45 +0000 (19:40 -0700)]
libxvid: Add SSIM displaying through a libxvidcore plugin
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Timothy Gu [Wed, 31 Jul 2013 02:39:06 +0000 (19:39 -0700)]
libxvid: add working lumimasking and variance AQ
The old implementation is unusable due to changes in the Xvid API.
Further fixes by Michael Niedermayer <michaelni@gmx.at>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Sun, 6 Apr 2014 20:46:29 +0000 (22:46 +0200)]
Merge commit '
6f273093e54cba130f3ffde3d6433e74baa4ad89'
* commit '
6f273093e54cba130f3ffde3d6433e74baa4ad89':
LucasArts SMUSH VIMA audio decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavcodec/vima.c
This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav
See:
b18357326ca1522d7fb7f4276ddebfccc29ce72c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 20:00:07 +0000 (22:00 +0200)]
Merge commit '
a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
* commit '
a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See:
69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 6 Apr 2014 17:42:28 +0000 (19:42 +0200)]
rtspdec: check for strchr returning NULL.
Fixes CID 732244.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Janne Grunau [Sat, 5 Apr 2014 09:47:18 +0000 (11:47 +0200)]
aarch64: implement videodsp.prefetch
8% faster h264 decoding on Apple A7.
Janne Grunau [Sat, 5 Apr 2014 11:46:51 +0000 (13:46 +0200)]
aarch64: add armv8 CPU flag
Reimar Döffinger [Sun, 6 Apr 2014 17:31:45 +0000 (19:31 +0200)]
pulseaudio: move NULL check up before dereference.
Fixes CID 1197068.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Hendrik Leppkes [Sun, 6 Apr 2014 16:26:24 +0000 (18:26 +0200)]
dcadsp: fix SSE code to not use SSE2 instructions.
movq from SSE register to memory is an SSE2 instruction.
Instead, use SSE movlps, which does the same thing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 15:09:32 +0000 (17:09 +0200)]
avformat/oggdec/ogg_read_packet(): factorize failure code path
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 15:08:19 +0000 (17:08 +0200)]
avformat/oggdec: check for av_packet_new_side_data() failure
Fixes CID1197062
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 15:02:09 +0000 (17:02 +0200)]
avcodec/vp8: fix checking vp7_feature_value_size
Fixes CID1197061
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vladlen Y. Koshelev [Sat, 4 Jan 2014 22:18:12 +0000 (02:18 +0400)]
avformat/hls: support for seeking on event playlists
This allows clients to seek between first played segment
and the last one in the live stream playlist with #EXT-X-PLAYLIST-TYPE:EVENT attribute.
Anssi Hannula [Fri, 3 Jan 2014 11:52:20 +0000 (13:52 +0200)]
avformat/hls: flush the subdemuxer when seeking
Since we are basically seeking the AVIOContext under the subdemuxer, we
need to flush the subdemuxer to avoid old packets from being read from
the packet queue after the seek.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Fri, 3 Jan 2014 11:44:38 +0000 (13:44 +0200)]
avformat/hls: properly take stream_index into account when seeking
Properly take stream_index into account so that a keyframe will be
looked for in the specified stream_index only.
Similarly, only check timestamp validity against the specified
stream_index.
Also remove code for stream_index == -1 case which does not actually
happen as it is handled by generic code.
This is based on an initial patch by James Deng.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Fri, 3 Jan 2014 08:51:55 +0000 (10:51 +0200)]
avformat/hls: open playlists immediately when AVDISCARD_ALL is dropped
Do not try to delay opening newly required playlists until a segment
switch. Applications expect that newly selected undiscarded streams are
available immediately, especially with alternative rendition streams
(selectable audio/subtitle tracks).
One might think that delaying variant stream switch until a segment
switch would allow a "seamless" switch without us having to download a
specific segment from two different variant playlists. However, that is
not the case, since the application would have to keep the previous
stream available (undiscarded) until the first packet of the newly
selected stream arrives, but by that time the demuxer would have already
downloaded the next segment of both variants.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Fri, 3 Jan 2014 07:47:26 +0000 (09:47 +0200)]
avformat/hls: factor identical playlist allocations out of parse_playlist
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 09:53:56 +0000 (11:53 +0200)]
avformat/hls: do not use sequence numbers for packet ordering
As per spec 3.4.3 ("A client MUST NOT assume that segments with the same
sequence number in different Media Playlists contain matching content.")
we cannot use sequence numbers for packet ordering.
This can be seen e.g. in the subtitle streams of
bipbop_16x9_variant.m3u8 that have considerably longer segments and
therefore different numbering.
Since the code now exclusively syncs using timestamps that may wrap, add
some additional checking for that.
According to the HLS spec all the timestamps should be in 33-bit MPEG
format and synced together.
v2: cleaner wrap detection
v3: further wrap detection improvements
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 09:46:01 +0000 (11:46 +0200)]
avformat/hls: do not care about stream start timestamps
While selecting a packet to return to caller in read_packet(), the code
corrects the timestamps for starting timestamps.
However, this is wrong, since for live streams the initial timestamps
might differ just because of the time delay between the retrieval of the
various Media Playlists.
Fortunately, spec 6.2.4 mandates that all variant streams must have
matching timestamps, so we do not need to correct for initial
timestamps.
Drop the correction code.
Note that ID3 timestamps were previously ignored, so this code was
previously actually needed.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 09:40:20 +0000 (11:40 +0200)]
avformat/hls: avoid unnecessary segment retrievals
Check if the playlist is still needed just before requesting the next
segment instead of after exhausting the previous segment.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 09:27:36 +0000 (11:27 +0200)]
avformat/hls: improve segment selection when restarting list reception
Improve selection of the segment sequence number when restarting the
reception of a playlist after it was suspended due to being unneeded
(due to discard flags).
The current code assumes that each playlist contains matching data with
the same sequence number, while spec 3.4.3 specifically says that that
is not the case. Often subtitle playlists also have longer target
durations as well, causing the selection to be completely wrong.
Instead prefer using the playlist segment duration information for
non-live playlists, and other means if that is not possible.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 09:13:56 +0000 (11:13 +0200)]
avformat/hls: track seeking on a per-playlist basis
Seeking needs to be tracked on a per-playlist basis, since the resyncing
code in hls_read_packet() has to sync each playlist to the seek
timestamp instead of stopping after the first playlist has reached it.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 5 Apr 2014 11:47:26 +0000 (14:47 +0300)]
avformat/hls: parse ID3 timestamps for elementary audio streams
HLS provides MPEG TS timestamps via ID3 tags in the beginning of each
segment of elementary audio streams.
v2: fix issues with streams that have multiple ID3 tags
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 5 Apr 2014 09:16:27 +0000 (12:16 +0300)]
avformat/hls: split read_from_url() out of read_data()
Useful for ID3 parsing.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 28 Dec 2013 07:41:55 +0000 (09:41 +0200)]
avformat/hls: add some logging messages
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 28 Dec 2013 07:42:46 +0000 (09:42 +0200)]
avformat/hls: add support for byte-ranged segments
Add support for EXT-X-BYTERANGE added in HLS protocol v4.
v2: Better comment explaining ffurl_seek call and fix cur_seg_offset not
being updated.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 28 Dec 2013 07:42:32 +0000 (09:42 +0200)]
avformat/hls: always return EOF for unneeded playlist streams
Even if we returned AVERROR_EOF previously due to playlist no longer
being needed, we may still be called again, and we do not want to
trigger a segment download in that case.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Fri, 27 Dec 2013 22:09:45 +0000 (00:09 +0200)]
avformat/hls: add support for alternative renditions
HLS protocol version 4 added alternative renditions to the
specification (e.g. alternative audio tracks).
The EXT-X-MEDIA tags can also contain metadata for "renditions" (i.e.
tracks) of the main Media Playlist.
Add support for those.
Note that the same rendition (AVStream) may be associated with multiple
variants (AVPrograms).
Alternative subtitle tracks will require additional work and are
therefore not enabled yet.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Paul B Mahol [Thu, 21 Jun 2012 14:08:41 +0000 (14:08 +0000)]
fate: add tests for SANM and VIMA
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Tue, 11 Mar 2014 15:24:55 +0000 (16:24 +0100)]
LucasArts SMUSH demuxer
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Mon, 19 Mar 2012 02:52:08 +0000 (02:52 +0000)]
LucasArts SMUSH VIMA audio decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Mon, 19 Mar 2012 02:54:19 +0000 (02:54 +0000)]
LucasArts SMUSH SANM video decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Thilo Borgmann [Sun, 6 Apr 2014 12:57:24 +0000 (14:57 +0200)]
configure: Add workaround for qtkit detection using ICC compiler.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 02:01:24 +0000 (04:01 +0200)]
avcodec/msrle: check return code for success before use
The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash
Fixes CID1197060
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Apr 2014 01:51:46 +0000 (03:51 +0200)]
avcodec/pthread_frame: fix missing unlock on error
Fixes CID1197057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 6 Apr 2014 00:42:31 +0000 (02:42 +0200)]
Consider aspect ratio when writing tiff dpi.
TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.
Michael Niedermayer [Sat, 5 Apr 2014 23:34:48 +0000 (01:34 +0200)]
avformat/oggparsevorbis: remove non functional null check
Fixes CID1197055
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 22:39:58 +0000 (00:39 +0200)]
examples/avio_reading: fix null dereference on error
Fixed CID1197052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 22:34:09 +0000 (00:34 +0200)]
avformat/cinedec: ask for sample when biBitCount isnt supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 21:00:23 +0000 (23:00 +0200)]
avformat/cinedec: remove redundant zero termination
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 20:49:17 +0000 (22:49 +0200)]
avformat/mov: Fix width/height typo
Fixes CID1197050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 20:36:06 +0000 (22:36 +0200)]
avformat/cinedec: fix sizeof()
Fixes CID1197047
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 20:07:43 +0000 (22:07 +0200)]
avformat/omadec: fix probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 19:34:03 +0000 (21:34 +0200)]
avcodec/wma: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 19:31:25 +0000 (21:31 +0200)]
avcodec/vp8: fix name of copy_luma()
This function was introduced by
ac4b32df71bd932838043a4838b86d11e169707f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:43:28 +0000 (19:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:36:07 +0000 (19:36 +0200)]
Merge commit '
57b5b84e208ad61ffdd74ad849bed212deb92bc5'
* commit '
57b5b84e208ad61ffdd74ad849bed212deb92bc5':
x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:30:18 +0000 (19:30 +0200)]
Merge commit '
c2c5be57494e6117086771bca34c8cd4c72c8e99'
* commit '
c2c5be57494e6117086771bca34c8cd4c72c8e99':
x86: h264_qpel: Simplify an #if conditional
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)]
Merge commit '
01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '
01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:09:56 +0000 (19:09 +0200)]
Merge commit '
b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7'
* commit '
b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7':
ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 17:04:56 +0000 (19:04 +0200)]
Merge commit '
b42f49e42f8cde25a788b2d13d03e99ca2956647'
* commit '
b42f49e42f8cde25a788b2d13d03e99ca2956647':
x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 16:48:42 +0000 (18:48 +0200)]
Merge commit '
3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '
3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
Remove a number of unnecessary dsputil.h #includes
Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 3 Apr 2014 04:46:18 +0000 (01:46 -0300)]
x86/dcadsp: add ff_dca_lfe_fir0_fma3
~10% faster than the SSE version.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 11:30:27 +0000 (13:30 +0200)]
configure: use TMPM in check_header_oc
Some compilers when given -x objective-c will tell that they dont support
that but return success. Using a .m file instead returns proper failure in
that case
This should fix a build failure on freebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Apr 2014 11:29:28 +0000 (13:29 +0200)]
configure: more properly disable header when check_header_oc() fails
This should make no difference currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>