ffmpeg.git
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Apr 2014 12:36:24 +0000 (14:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h

See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Use x265_param_parse to set the SAR
Derek Buitenhuis [Tue, 8 Apr 2014 17:44:53 +0000 (18:44 +0100)]
libx265: Use x265_param_parse to set the SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibavfilter: Add asettb filter for setting timebase for audio
Nicolas George [Thu, 3 Apr 2014 13:42:22 +0000 (15:42 +0200)]
libavfilter: Add asettb filter for setting timebase for audio

Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavf/utils: fix mem leak
Lukasz Marek [Wed, 9 Apr 2014 20:43:48 +0000 (22:43 +0200)]
lavf/utils: fix mem leak

Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: fix warning about RGB_PACK24_B_OPERANDS redefinition
Lukasz Marek [Wed, 9 Apr 2014 20:25:43 +0000 (22:25 +0200)]
sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 9 Apr 2014 22:33:51 +0000 (00:33 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: change some asserts to av_asserts
Michael Niedermayer [Wed, 9 Apr 2014 21:57:18 +0000 (23:57 +0200)]
avcodec/mpegvideo_enc: change some asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nut: add ff_nut_audio_extra_tags to demuxer too
Michael Niedermayer [Wed, 9 Apr 2014 21:37:55 +0000 (23:37 +0200)]
avformat/nut: add ff_nut_audio_extra_tags to demuxer too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix a typo in amr.c.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:34:04 +0000 (22:34 +0200)]
Fix a typo in amr.c.

5 years agoRemove an unneeded include of avassert.h from amr.c.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:33:29 +0000 (22:33 +0200)]
Remove an unneeded include of avassert.h from amr.c.

5 years agoDo not allow writing invalid wav channel layouts by default.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:31:40 +0000 (22:31 +0200)]
Do not allow writing invalid wav channel layouts by default.

Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543.

5 years agoavcodec/cngdec: use av_mallocz_array()
Michael Niedermayer [Wed, 9 Apr 2014 21:18:32 +0000 (23:18 +0200)]
avcodec/cngdec: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity
Michael Niedermayer [Wed, 9 Apr 2014 21:05:15 +0000 (23:05 +0200)]
avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: ask for sample for "oversized image"
Michael Niedermayer [Wed, 9 Apr 2014 21:03:09 +0000 (23:03 +0200)]
avcodec/jpeglsdec: ask for sample for "oversized image"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: drop confusing av_dlog()
Michael Niedermayer [Wed, 9 Apr 2014 21:02:50 +0000 (23:02 +0200)]
avcodec/mpeg12dec: drop confusing av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dirac_arith: Fix build with PIC and stack-check options
Anthoine Bourgeois [Wed, 9 Apr 2014 10:18:32 +0000 (12:18 +0200)]
avcodec/dirac_arith: Fix build with PIC and stack-check options

Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: factor "level != AV_LOG_INFO/8" checks out
Michael Niedermayer [Wed, 9 Apr 2014 14:30:16 +0000 (16:30 +0200)]
avutil/log: factor "level != AV_LOG_INFO/8" checks out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sanm: use named consant instead of literal number
Michael Niedermayer [Wed, 9 Apr 2014 14:23:57 +0000 (16:23 +0200)]
avcodec/sanm: use named consant instead of literal number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore
Michael Niedermayer [Wed, 9 Apr 2014 14:08:56 +0000 (16:08 +0200)]
avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove operations that have become redundant with AVFrame pointers
Michael Niedermayer [Wed, 9 Apr 2014 14:08:02 +0000 (16:08 +0200)]
avcodec/snowenc: remove operations that have become redundant with AVFrame pointers

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

* qatar/master:
  mpegvideo: operate with pointers to AVFrames instead of whole structs

Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c

See: fc567ac49e17151f00f31b59030cd10f952612ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
Michael Niedermayer [Wed, 9 Apr 2014 11:40:04 +0000 (13:40 +0200)]
Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'

* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
  fate: correctly set sample rate for mp2 tests

Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Fail on missing prototypes in check_oc.
Thilo Borgmann [Wed, 9 Apr 2014 09:18:14 +0000 (11:18 +0200)]
configure: Fail on missing prototypes in check_oc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudioenc_template: reorder operations to prevent integer overflow
Michael Niedermayer [Wed, 9 Apr 2014 04:56:53 +0000 (06:56 +0200)]
avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudioenc_template: dont crash on bitrate=0
Michael Niedermayer [Wed, 9 Apr 2014 03:16:52 +0000 (05:16 +0200)]
avcodec/mpegaudioenc_template: dont crash on bitrate=0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agompegvideo: operate with pointers to AVFrames instead of whole structs
wm4 [Mon, 31 Mar 2014 17:46:29 +0000 (17:46 +0000)]
mpegvideo: operate with pointers to AVFrames instead of whole structs

The most interesting parts are initialization in ff_MPV_common_init() and
uninitialization in ff_MPV_common_end().

ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL
checks for Picture.f, because these functions can be called on
uninitialized or partially initialized Pictures.

NULL pointer checks are added to ff_thread_release_buffer() stub function.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agofate: correctly set sample rate for mp2 tests
Vittorio Giovara [Wed, 9 Apr 2014 00:02:29 +0000 (02:02 +0200)]
fate: correctly set sample rate for mp2 tests

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>