ffmpeg.git
5 years agoswscale/input: replace assert() by av_assert1()
Michael Niedermayer [Wed, 9 Apr 2014 03:14:34 +0000 (05:14 +0200)]
swscale/input: replace assert() by av_assert1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Apr 2014 02:54:26 +0000 (04:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Completely document the x264 options

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0d671ade99059fd47b155df85c10c35eb6d54878'
Michael Niedermayer [Wed, 9 Apr 2014 02:40:39 +0000 (04:40 +0200)]
Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'

* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
  doc: Use a 3 columns multitable

Conflicts:
doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'
Michael Niedermayer [Wed, 9 Apr 2014 02:26:20 +0000 (04:26 +0200)]
Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'

* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd':
  doc: Change the multitable rendering in texi2pod

Conflicts:
doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'
Michael Niedermayer [Wed, 9 Apr 2014 02:15:59 +0000 (04:15 +0200)]
Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'

* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
  fate: update tests for YVYU422 pixel format

Conflicts:
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'
Michael Niedermayer [Wed, 9 Apr 2014 01:41:40 +0000 (03:41 +0200)]
Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'

* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
  rawvideo: Support decoding YVYU422 FourCC

See: ab7d6cb8f770c3b88a8139d1182fcc934062f891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
Michael Niedermayer [Wed, 9 Apr 2014 01:20:52 +0000 (03:20 +0200)]
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format

Conflicts:
libswscale/input.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
Michael Niedermayer [Wed, 9 Apr 2014 01:07:47 +0000 (03:07 +0200)]
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'

* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
  lavu: Add packed YVYU422 pixel format

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '46439e156219d27f059cf687743ba5aacf238b87'
Michael Niedermayer [Wed, 9 Apr 2014 00:24:42 +0000 (02:24 +0200)]
Merge commit '46439e156219d27f059cf687743ba5aacf238b87'

* commit '46439e156219d27f059cf687743ba5aacf238b87':
  mp2: match twolame default options

Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '718907cd881a0b593264aed059c0e00da13f9e15'
Michael Niedermayer [Wed, 9 Apr 2014 00:16:05 +0000 (02:16 +0200)]
Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/libtwolame.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils: scale filter_size in warning so that it can be used as max for the...
Michael Niedermayer [Tue, 8 Apr 2014 22:54:54 +0000 (00:54 +0200)]
swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils: dont print message about filter size when the cause is a malloc failure
Michael Niedermayer [Tue, 8 Apr 2014 22:23:56 +0000 (00:23 +0200)]
swscale/utils: dont print message about filter size when the cause is a malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Completely document the x264 options
Luca Barbato [Mon, 7 Apr 2014 01:49:41 +0000 (01:49 +0000)]
doc: Completely document the x264 options

And fix an option mismatch.

5 years agodoc: Use a 3 columns multitable
Luca Barbato [Mon, 7 Apr 2014 01:49:40 +0000 (01:49 +0000)]
doc: Use a 3 columns multitable

Make the html output much nicer.

5 years agodoc: Change the multitable rendering in texi2pod
Luca Barbato [Mon, 7 Apr 2014 01:49:39 +0000 (01:49 +0000)]
doc: Change the multitable rendering in texi2pod

Makes it working better for our documentation purposes.

5 years agofate: update tests for YVYU422 pixel format
Vittorio Giovara [Mon, 7 Apr 2014 21:45:55 +0000 (23:45 +0200)]
fate: update tests for YVYU422 pixel format

5 years agorawvideo: Support decoding YVYU422 FourCC
Vittorio Giovara [Sun, 9 Mar 2014 12:26:19 +0000 (12:26 +0000)]
rawvideo: Support decoding YVYU422 FourCC

5 years agoavcodec/j2kenc: use av_malloc(z)_array()
Michael Niedermayer [Tue, 8 Apr 2014 20:39:47 +0000 (22:39 +0200)]
avcodec/j2kenc: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libzvbi-teletextdec: remove * 1
Michael Niedermayer [Tue, 8 Apr 2014 20:38:21 +0000 (22:38 +0200)]
avcodec/libzvbi-teletextdec: remove * 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libopencore-amr: use av_mallocz_array()
Michael Niedermayer [Tue, 8 Apr 2014 20:37:55 +0000 (22:37 +0200)]
avcodec/libopencore-amr: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortspcodes: don't check for >0 on error codes macro
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>
5 years agoconfigure: AVI demux needs exif
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>
5 years agoswscale/swscale_internal: remove obsolete warning
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>
5 years agoswscale/swscale_internal: make the offset strings update themselfs when the MAX_FILTE...
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>
5 years agoswscale/x86/swscale_template: loose hardcoded dstw_offset
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>
5 years agovcodec/bitstream: use av_malloc_array()
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>
5 years agoavcodec/avpacket: use av_malloc_array()
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>
5 years agoavcodec/a64multienc: use av_malloc(z)_array()
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>
5 years agocmdutils: use av_mallocz_array()
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>
5 years agoavcodec/ac3enc_float: use av_malloc_array()
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>
5 years agoexamples/transcoding: use av_malloc_array()
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>
5 years agoMerge remote-tracking branch 'cehoyos/master'
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>
5 years agoavfilter/vf_colormatrix: fix memleak on error
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>
5 years agoswresample/resample: use av_malloc_array() where appropriate
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>
5 years agoswresample/dither: use av_malloc_array()
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>
5 years agoswresample/resample: Limit filter length
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>
5 years agoFix compilation with --disable-everything --enable-decoder=rawvideo.
Carl Eugen Hoyos [Mon, 7 Apr 2014 22:04:25 +0000 (00:04 +0200)]
Fix compilation with --disable-everything --enable-decoder=rawvideo.

5 years agoswscale: support converting YVYU422 pixel format
Vittorio Giovara [Mon, 7 Apr 2014 15:19:53 +0000 (17:19 +0200)]
swscale: support converting YVYU422 pixel format

5 years agolavu: Add packed YVYU422 pixel format
Vittorio Giovara [Sun, 9 Mar 2014 12:26:18 +0000 (12:26 +0000)]
lavu: Add packed YVYU422 pixel format

5 years agomp2: match twolame default options
Vittorio Giovara [Mon, 7 Apr 2014 14:25:23 +0000 (16:25 +0200)]
mp2: match twolame default options

5 years agolibtwolame MP2 encoding support
Paul B Mahol [Wed, 1 Aug 2012 16:33:34 +0000 (16:33 +0000)]
libtwolame MP2 encoding support

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
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>
5 years agoFix standalone compilation of vp7 and vp8 decoder.
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.

5 years agoRead aspect ratio from tiff image files.
Carl Eugen Hoyos [Mon, 7 Apr 2014 08:39:55 +0000 (10:39 +0200)]
Read aspect ratio from tiff image files.

5 years agolibxvid: fix missing end of line character
Vittorio Giovara [Mon, 7 Apr 2014 12:56:25 +0000 (14:56 +0200)]
libxvid: fix missing end of line character

Error introduced in 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.

5 years agoavformat/oggdec: reset nstreams in close
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>
5 years agoavformat/mov: reset drefs_count in close
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>
5 years agoRemove leal op to fix icl inline asm.
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>
5 years agoffserver: don't hardcode RTSP status codes
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>
5 years agortspcodes: add full list of RTSP status codes
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>
5 years agoffserver: nits & typos
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>
5 years agoconfigure: Check for generated output in check_header_oc.
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>
5 years agoavcodec/h264/find_start_code: factorize addition out
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>
5 years agoMerge remote-tracking branch 'qatar/master'
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>
5 years agoMerge commit 'f73495686d109ffffaa8c0387e790e7997326229'
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>
5 years agoMerge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
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>
5 years agoMerge commit 'c389a804943095ebf078daec6b64690d2c97069c'
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>
5 years agoMerge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
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>
5 years agoMerge commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332'
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>
5 years agoMerge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'
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>
5 years agolavc/cpia: use avpriv_report_missing_feature()
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>
5 years agolavc/cpia: fix typo in log message
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>
5 years agoxtea: Add Doxy @file and group
Timothy Gu [Sat, 2 Nov 2013 22:03:30 +0000 (15:03 -0700)]
xtea: Add Doxy @file and group

5 years agoadler32: Fix doxy group definition
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>
5 years agoMerge remote-tracking branch 'cehoyos/master'
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>
5 years agoMerge remote-tracking branch 'qatar/master'
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>
5 years agoSet Matroska private data when muxing Prores.
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".

5 years agoh264: Refactor decode_nal_units
Luca Barbato [Sat, 5 Apr 2014 00:41:12 +0000 (00:41 +0000)]
h264: Refactor decode_nal_units

5 years agoMerge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'
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>
5 years agolibxvid: Add SSIM displaying through a libxvidcore plugin
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>
5 years agolibxvid: add working lumimasking and variance AQ
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>
5 years agoMerge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
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>
5 years agoMerge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
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>
5 years agortspdec: check for strchr returning NULL.
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>
5 years agoaarch64: implement videodsp.prefetch
Janne Grunau [Sat, 5 Apr 2014 09:47:18 +0000 (11:47 +0200)]
aarch64: implement videodsp.prefetch

8% faster h264 decoding on Apple A7.

5 years agoaarch64: add armv8 CPU flag
Janne Grunau [Sat, 5 Apr 2014 11:46:51 +0000 (13:46 +0200)]
aarch64: add armv8 CPU flag

5 years agopulseaudio: move NULL check up before dereference.
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>
5 years agodcadsp: fix SSE code to not use SSE2 instructions.
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>
5 years agoavformat/oggdec/ogg_read_packet(): factorize failure code path
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>
5 years agoavformat/oggdec: check for av_packet_new_side_data() failure
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>
5 years agoavcodec/vp8: fix checking vp7_feature_value_size
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>
5 years agoavformat/hls: support for seeking on event playlists
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.

5 years agoavformat/hls: flush the subdemuxer when seeking
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>
5 years agoavformat/hls: properly take stream_index into account when seeking
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>
5 years agoavformat/hls: open playlists immediately when AVDISCARD_ALL is dropped
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>
5 years agoavformat/hls: factor identical playlist allocations out of parse_playlist
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>
5 years agoavformat/hls: do not use sequence numbers for packet ordering
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>
5 years agoavformat/hls: do not care about stream start timestamps
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>
5 years agoavformat/hls: avoid unnecessary segment retrievals
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>
5 years agoavformat/hls: improve segment selection when restarting list reception
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>
5 years agoavformat/hls: track seeking on a per-playlist basis
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>
5 years agoavformat/hls: parse ID3 timestamps for elementary audio streams
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>
5 years agoavformat/hls: split read_from_url() out of read_data()
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>
5 years agoavformat/hls: add some logging messages
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>
5 years agoavformat/hls: add support for byte-ranged segments
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>
5 years agoavformat/hls: always return EOF for unneeded playlist streams
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>
5 years agoavformat/hls: add support for alternative renditions
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>
5 years agofate: add tests for SANM and VIMA
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>
5 years agoLucasArts SMUSH demuxer
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>
5 years agoLucasArts SMUSH VIMA audio decoder
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>