ffmpeg.git
5 years agomjpegdec: Support pix_fmt_id == 0x22112200
Michael Niedermayer [Tue, 1 Jul 2014 19:47:09 +0000 (21:47 +0200)]
mjpegdec: Support pix_fmt_id == 0x22112200

Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
Michael Niedermayer [Tue, 1 Jul 2014 18:44:05 +0000 (20:44 +0200)]
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'

* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'
Michael Niedermayer [Tue, 1 Jul 2014 18:22:51 +0000 (20:22 +0200)]
Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'
Michael Niedermayer [Tue, 1 Jul 2014 17:58:57 +0000 (19:58 +0200)]
Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'
Michael Niedermayer [Tue, 1 Jul 2014 17:28:55 +0000 (19:28 +0200)]
Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

See: 581b5f0b9b93969712e73e0ae6324bbd03e85d4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: convert resample_{common, linear}_double_sse2 to yasm
James Almer [Mon, 30 Jun 2014 16:06:00 +0000 (13:06 -0300)]
x86/swr: convert resample_{common, linear}_double_sse2 to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
312531 -> 311528 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroska: Factor out mkv_write_stereo_mode
Luca Barbato [Fri, 6 Jun 2014 23:38:00 +0000 (01:38 +0200)]
matroska: Factor out mkv_write_stereo_mode

5 years agomatroska: Factor out write_track from mkv_write_tracks
Luca Barbato [Fri, 6 Jun 2014 23:21:13 +0000 (01:21 +0200)]
matroska: Factor out write_track from mkv_write_tracks

5 years agomatroska: K&R formatting cosmetics
Luca Barbato [Fri, 6 Jun 2014 22:54:50 +0000 (00:54 +0200)]
matroska: K&R formatting cosmetics

5 years agovaapi: Update idct_permutation location after dsputil/idctdsp split
Diego Biurrun [Tue, 1 Jul 2014 14:27:50 +0000 (07:27 -0700)]
vaapi: Update idct_permutation location after dsputil/idctdsp split

5 years agoMerge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'
Michael Niedermayer [Tue, 1 Jul 2014 14:31:54 +0000 (16:31 +0200)]
Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'

* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79793f833784121d574454af4871866576c0749d'
Michael Niedermayer [Tue, 1 Jul 2014 13:37:21 +0000 (15:37 +0200)]
Merge commit '79793f833784121d574454af4871866576c0749d'

* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
Michael Niedermayer [Tue, 1 Jul 2014 12:38:57 +0000 (14:38 +0200)]
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: Support default-base-is-moof.
Yusuke Nakamura [Tue, 1 Jul 2014 05:17:56 +0000 (14:17 +0900)]
mov: Support default-base-is-moof.

default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
Michael Niedermayer [Tue, 1 Jul 2014 11:12:02 +0000 (13:12 +0200)]
Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'

* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
  mjpeg: Split off bits shared by MJPEG and LJPEG encoders

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate Fiona's name in copyright statements.
Diego Biurrun [Tue, 1 Jul 2014 09:52:37 +0000 (11:52 +0200)]
Update Fiona's name in copyright statements.

5 years agoavfilter/f_ebur128: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:53 +0000 (03:50 +0200)]
avfilter/f_ebur128: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Use av_malloc(z)_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:17 +0000 (03:50 +0200)]
avcodec/hevc: Use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils_opencl: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:49:36 +0000 (03:49 +0200)]
cmdutils_opencl: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/showcqt: adding freetype support
Muhammad Faiz [Mon, 30 Jun 2014 03:30:23 +0000 (10:30 +0700)]
avfilter/showcqt: adding freetype support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/xv: fix missing {
Michael Niedermayer [Mon, 30 Jun 2014 19:31:43 +0000 (21:31 +0200)]
avdevice/xv: fix missing {

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: convert resample_common/linear_int16_mmx2/sse2 to yasm.
Ronald S. Bultje [Sun, 29 Jun 2014 23:19:03 +0000 (20:19 -0300)]
swr: convert resample_common/linear_int16_mmx2/sse2 to yasm.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: handle delete window message
Lukasz Marek [Tue, 27 May 2014 20:57:26 +0000 (22:57 +0200)]
lavd/xv: handle delete window message

User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: remove unused variables
Michael Niedermayer [Mon, 30 Jun 2014 16:24:37 +0000 (18:24 +0200)]
avcodec/pgssubdec: remove unused variables

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: Check input buffer size in parse_presentation_segment()
Michael Niedermayer [Mon, 30 Jun 2014 16:23:08 +0000 (18:23 +0200)]
avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()

Might fix overread, no testcase known though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'
Michael Niedermayer [Mon, 30 Jun 2014 15:58:51 +0000 (17:58 +0200)]
Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'

* commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772':
  pgssubdec: handle more complex PGS scenarios

Conflicts:
libavcodec/pgssubdec.c

Some of this has been split out and commited in cleanly split patches immedeately
before this merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: fix end display time
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: fix end display time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is set
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: better error codes
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: better error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: split out flush_cache()
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: split out flush_cache()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Split off IDCT bits into their own context
Diego Biurrun [Fri, 24 Jan 2014 10:55:16 +0000 (11:55 +0100)]
dsputil: Split off IDCT bits into their own context

5 years agomjpeg: Split off bits shared by MJPEG and LJPEG encoders
Diego Biurrun [Mon, 30 Jun 2014 12:37:59 +0000 (05:37 -0700)]
mjpeg: Split off bits shared by MJPEG and LJPEG encoders

This obviates a dependency of the LJPEG encoder on mpegvideo.

5 years agoavcodec/pgssubdec: do not fail when part of the packet is faulty unless AV_EF_EXPLODE...
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: do not fail when part of the packet is faulty unless AV_EF_EXPLODE is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: rename PICTURE_SEGMENT
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
avcodec/pgssubdec: rename PICTURE_SEGMENT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: remove trailing ':' at the end of sections
Clément Bœsch [Mon, 30 Jun 2014 13:34:51 +0000 (15:34 +0200)]
doc: remove trailing ':' at the end of sections

Also lowercase "options" in "Advanced Video Options" for consistency.

5 years agopgssubdec: handle more complex PGS scenarios
John Stebbins [Wed, 18 Jun 2014 20:38:36 +0000 (13:38 -0700)]
pgssubdec: handle more complex PGS scenarios

Add ability to handle multiple palettes and objects simultaneously.
Each simultaneous object is given its own AVSubtitleRect.
Note that there can be up to 64 currently valid objects, but only
2 at any one time can be "presented".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/hdsenc: Use av_mallocz_array()
Michael Niedermayer [Mon, 30 Jun 2014 03:08:33 +0000 (05:08 +0200)]
avformat/hdsenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtsp: use av_malloc_array()
Michael Niedermayer [Mon, 30 Jun 2014 03:08:16 +0000 (05:08 +0200)]
avformat/rtsp: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/resample_template: move division out of loop for float/double swri_resampl...
Michael Niedermayer [Sun, 29 Jun 2014 12:23:49 +0000 (14:23 +0200)]
swresample/resample_template: move division out of loop for float/double swri_resample_linear()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 29 Jun 2014 20:26:43 +0000 (22:26 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  configure: enable lto for icl compiler.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/resample_template: flip order of operations in swri_resample_linear()...
Michael Niedermayer [Sun, 29 Jun 2014 11:55:29 +0000 (13:55 +0200)]
swresample/resample_template: flip order of operations in swri_resample_linear() for 32bit

Fixes integer overflow

Found-by: BBB
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: enable lto for icl compiler.
Matthew Oliver [Sat, 28 Jun 2014 17:28:39 +0000 (03:28 +1000)]
configure: enable lto for icl compiler.

5 years agocmdutils: ignore sws_flags if swscale is not enabled
Michael Niedermayer [Sun, 29 Jun 2014 15:01:39 +0000 (17:01 +0200)]
cmdutils: ignore sws_flags if swscale is not enabled

This avoids some failures during fate when swscale is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuvencdsp: try to fix misaligned access
Michael Niedermayer [Sun, 29 Jun 2014 14:26:03 +0000 (16:26 +0200)]
avcodec/huffyuvencdsp: try to fix misaligned access

Should fix fate on MIPS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/resampling_audio: use av_freep() for saftey
Michael Niedermayer [Sun, 29 Jun 2014 13:50:29 +0000 (15:50 +0200)]
doc/examples/resampling_audio: use av_freep() for saftey

also its better in examples to use the safer functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/overlay: reindent
Clément Bœsch [Sun, 29 Jun 2014 11:26:12 +0000 (13:26 +0200)]
avfilter/overlay: reindent

5 years agoavfilter/buffersrc: reindent
Clément Bœsch [Sun, 29 Jun 2014 11:26:04 +0000 (13:26 +0200)]
avfilter/buffersrc: reindent

5 years agoffmpeg_opt: route -ab to -b:a
Michael Niedermayer [Sun, 29 Jun 2014 00:47:49 +0000 (02:47 +0200)]
ffmpeg_opt: route -ab to -b:a

Fixes combining -ab with -target pal-dvd
Fixes Ticket3736

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARM
Michael Niedermayer [Sat, 28 Jun 2014 22:52:42 +0000 (00:52 +0200)]
avfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARM

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>
5 years agodoc/examples/muxing: remove unused variable
Michael Niedermayer [Sat, 28 Jun 2014 19:44:38 +0000 (21:44 +0200)]
doc/examples/muxing: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7b0c7c9163fe3dd0081696befde28617119d2590'
Michael Niedermayer [Sat, 28 Jun 2014 19:31:14 +0000 (21:31 +0200)]
Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'

* commit '7b0c7c9163fe3dd0081696befde28617119d2590':
  arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/options_table: Fix flush_packet flag flags
Michael Niedermayer [Sat, 28 Jun 2014 19:23:32 +0000 (21:23 +0200)]
avformat/options_table: Fix flush_packet flag flags

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: fix flush_packets flag with flushing buffers
Michael Niedermayer [Sat, 28 Jun 2014 19:23:32 +0000 (21:23 +0200)]
avformat/mux: fix flush_packets flag with flushing buffers

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel
Martin Storsjö [Mon, 23 Jun 2014 17:49:21 +0000 (20:49 +0300)]
arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel

When running on a 64 bit kernel, /proc/cpuinfo lists different
optional features than on 32 bit kernels (because some of them
are mandatory in the 64 bit implemenations).

The kernel does list the old features properly if they are queried
via /proc/self/auxv though - however this file is not always readable
(e.g. on most android systems). The getauxval function could also
provide the same info as /proc/self/auxv even if this file isn't
readable, but this function is not always available (and thus would
need to be loaded with dlsym for compatibility with older android
versions).

The android cpufeatures library does this slightly differently,
by assuming that these are available if the "CPU architecture"
line is >= 8, see [1] for details.

It has been suggested to include the old, non-optional features in
/proc/cpuinfo as well, but that suggested patch never was merged.
See [2] for the discussion around this suggestion.

[1] https://android-review.googlesource.com/91380
[2] http://marc.info/?l=linux-arm-kernel&m=139087240101974

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/cavs: improve conformance with rm52j reference decoder
Yao Wang [Sat, 28 Jun 2014 16:45:31 +0000 (18:45 +0200)]
avcodec/cavs: improve conformance with rm52j reference decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cavs: make cavs_chroma_qp non static
Michael Niedermayer [Sat, 28 Jun 2014 17:06:32 +0000 (19:06 +0200)]
avcodec/cavs: make cavs_chroma_qp non static

The table is needed by multiple files

Reverts part of ef07ac1e126b95ad7e1b56504c19b59901265c3e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: rewrite resample_common/linear_float_sse/avx in yasm.
Ronald S. Bultje [Sat, 28 Jun 2014 15:05:52 +0000 (11:05 -0400)]
swr: rewrite resample_common/linear_float_sse/avx in yasm.

Linear interpolation goes from 63 (llvm) or 58 (gcc) to 48 (yasm)
cycles/sample on 64bit, or from 66 (llvm/gcc) to 52 (yasm) cycles/
sample on 32bit. Bon-linear goes from 43 (llvm) or 38 (gcc) to
32 (yasm) cycles/sample on 64bit, or from 46 (llvm) or 44 (gcc) to
38 (yasm) cycles/sample on 32bit (all testing on OSX 10.9.2, llvm
5.1 and gcc 4.8/9).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm
Michael Niedermayer [Sat, 28 Jun 2014 14:01:32 +0000 (16:01 +0200)]
avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: move dst_size == 0 handling outside DSP function.
Ronald S. Bultje [Sat, 28 Jun 2014 12:00:05 +0000 (08:00 -0400)]
swr: move dst_size == 0 handling outside DSP function.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: lengthening a hash to make it non ambigous
Michael Niedermayer [Sat, 28 Jun 2014 11:11:32 +0000 (13:11 +0200)]
doc/APIchanges: lengthening a hash to make it non ambigous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAPIchanges: fillin some missing data
Michael Niedermayer [Sat, 28 Jun 2014 11:10:23 +0000 (13:10 +0200)]
APIchanges: fillin some missing data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '39975acc699c83af0a87a7318c0f41e189142938'
Michael Niedermayer [Sat, 28 Jun 2014 10:39:55 +0000 (12:39 +0200)]
Merge commit '39975acc699c83af0a87a7318c0f41e189142938'

* commit '39975acc699c83af0a87a7318c0f41e189142938':
  rtpenc_jpeg: check for color_range too

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'
Michael Niedermayer [Sat, 28 Jun 2014 10:33:07 +0000 (12:33 +0200)]
Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'

* commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12':
  apichanges: fill in changes for lavu 51.19 and 51.20

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortpenc_jpeg: check for color_range too
Vittorio Giovara [Thu, 26 Jun 2014 19:29:52 +0000 (15:29 -0400)]
rtpenc_jpeg: check for color_range too

5 years agoapichanges: fill in changes for lavu 51.19 and 51.20
Vittorio Giovara [Mon, 23 Jun 2014 22:50:34 +0000 (18:50 -0400)]
apichanges: fill in changes for lavu 51.19 and 51.20

5 years agoavcodec/mpegvideo: dont overwrite emu_edge buffer
Michael Niedermayer [Sat, 28 Jun 2014 04:28:21 +0000 (06:28 +0200)]
avcodec/mpegvideo: dont overwrite emu_edge buffer

Fixes vsynth3 fate failures on mips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: reduce space between blocks in emu_edge in encode_mb_internal
Michael Niedermayer [Sat, 28 Jun 2014 04:27:15 +0000 (06:27 +0200)]
avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in encode_mb_internal

5 years agoRevert "x86/videodsp: add emulated_edge_mc_mmxext"
Michael Niedermayer [Sat, 28 Jun 2014 03:33:52 +0000 (05:33 +0200)]
Revert "x86/videodsp: add emulated_edge_mc_mmxext"

The commit causes minor out of array reads and was mainly intended for
future optimizations which turned out not to be meassurably faster.
Itself it was just 1 cpu cycle faster

Approved-by: jamrial
This reverts commit 057d2704e78b52fec357b4fc646c9de37a085413.

5 years agoavcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the resolution...
Michael Niedermayer [Fri, 27 Jun 2014 22:16:09 +0000 (00:16 +0200)]
avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the resolution changes

Fixes Ticket3743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp8: Fix multiple ff_thread_finish_setup() calls
Michael Niedermayer [Fri, 27 Jun 2014 20:45:43 +0000 (22:45 +0200)]
avcodec/vp8: Fix multiple ff_thread_finish_setup() calls

Fixes Ticket3725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
Michael Niedermayer [Fri, 27 Jun 2014 17:20:12 +0000 (19:20 +0200)]
Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'

* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
  mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

Conflicts:
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
Michael Niedermayer [Fri, 27 Jun 2014 17:13:34 +0000 (19:13 +0200)]
Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'

* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
  dv: Properly split decoder and encoder initialization

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: fix deadlock regression in threading error handing
Sergey [Fri, 27 Jun 2014 06:00:53 +0000 (10:00 +0400)]
ffmpeg: fix deadlock regression in threading error handing

Commit fc9c857c introduced deadlock regression when processing too many inputs:
  ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null -
Happens for different number of inputs, depending on available memory size,
overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds,
that exhaust address space allocating 8-10 MB stack for each thread.
Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message.

This patch fixes both problems: it frees the queue to prevent deadlock
and adds a meaningful error message if pthread_create() fails.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: fix ignoring blank frame by updating got_output
Anshul Maheshwari [Fri, 27 Jun 2014 10:39:48 +0000 (16:09 +0530)]
avcodec/dvbsubdec: fix ignoring blank frame by updating got_output

fix ticket 3737

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg: Change ff_convert_matrix() to take an MpegEncContext parameter
Diego Biurrun [Fri, 7 Feb 2014 09:05:46 +0000 (10:05 +0100)]
mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

This will come in handy during dsputil splitting.

5 years agodv: Properly split decoder and encoder initialization
Diego Biurrun [Fri, 7 Feb 2014 10:04:24 +0000 (11:04 +0100)]
dv: Properly split decoder and encoder initialization

5 years agoconfigure: add missing audiodsp dependency for ra144
James Almer [Fri, 27 Jun 2014 06:00:22 +0000 (03:00 -0300)]
configure: add missing audiodsp dependency for ra144

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: fix g729 decoder dependencies
James Almer [Fri, 27 Jun 2014 06:00:21 +0000 (03:00 -0300)]
configure: fix g729 decoder dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: remove duplicate ape_decoder_select line
James Almer [Fri, 27 Jun 2014 06:00:20 +0000 (03:00 -0300)]
configure: remove duplicate ape_decoder_select line

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: factor ff_snow_get_buffer() out
Michael Niedermayer [Fri, 27 Jun 2014 02:45:04 +0000 (04:45 +0200)]
avcodec/snow: factor ff_snow_get_buffer() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfenc: rename very recently added option to set/force channelcount in MXF...
Gaullier Nicolas [Thu, 26 Jun 2014 16:10:45 +0000 (16:10 +0000)]
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10

Approved-by: Tomas Härdin <tomas.hardin@codemill.se>
Approved-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'
Michael Niedermayer [Fri, 27 Jun 2014 01:05:10 +0000 (03:05 +0200)]
Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'

* commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133':
  dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '24f45c16224d4c5d482e928676714766ffdda4fc'
Michael Niedermayer [Fri, 27 Jun 2014 00:36:45 +0000 (02:36 +0200)]
Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'

* commit '24f45c16224d4c5d482e928676714766ffdda4fc':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
libavcodec/fft-test.c
tests/fate/fft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'
Michael Niedermayer [Thu, 26 Jun 2014 23:31:42 +0000 (01:31 +0200)]
Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'

* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
  indeo4: B-frames decoding

Conflicts:
libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory
Diego Biurrun [Thu, 23 Jan 2014 16:25:16 +0000 (17:25 +0100)]
dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory

5 years agoMerge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'
Michael Niedermayer [Thu, 26 Jun 2014 23:11:49 +0000 (01:11 +0200)]
Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'

* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Add dependencies for dct/fft/mdct/rdft tests
Diego Biurrun [Thu, 26 Jun 2014 00:09:13 +0000 (17:09 -0700)]
fate: Add dependencies for dct/fft/mdct/rdft tests

5 years agoMerge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'
Michael Niedermayer [Thu, 26 Jun 2014 23:01:26 +0000 (01:01 +0200)]
Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'

* commit 'a5864e9a253143437471dba61a533e7fa9acec1c':
  output example: free the muxing format context properly

See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'
Michael Niedermayer [Thu, 26 Jun 2014 22:50:32 +0000 (00:50 +0200)]
Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'

* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
  output example: rewrite encoding logic

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'
Michael Niedermayer [Thu, 26 Jun 2014 22:16:34 +0000 (00:16 +0200)]
Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'

* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
  output example: store the scaling context in the stream context

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
Michael Niedermayer [Thu, 26 Jun 2014 21:58:00 +0000 (23:58 +0200)]
Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'

* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
  output example: use a macro instead of a static variable

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'
Michael Niedermayer [Thu, 26 Jun 2014 21:20:54 +0000 (23:20 +0200)]
Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'
Michael Niedermayer [Thu, 26 Jun 2014 21:00:36 +0000 (23:00 +0200)]
Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'

* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
  output example: use OutputStream for audio streams as well

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
Michael Niedermayer [Thu, 26 Jun 2014 20:44:35 +0000 (22:44 +0200)]
Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'

* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
  output example: use the new AVFrame API to allocate audio frames

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'
Michael Niedermayer [Thu, 26 Jun 2014 20:13:46 +0000 (22:13 +0200)]
Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'
Michael Niedermayer [Thu, 26 Jun 2014 19:55:11 +0000 (21:55 +0200)]
Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'

* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3':
  output example: use a struct to bundle the video stream variables together

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '38d044429dabcd28928693240e955c6d4430cca9'
Michael Niedermayer [Thu, 26 Jun 2014 19:28:54 +0000 (21:28 +0200)]
Merge commit '38d044429dabcd28928693240e955c6d4430cca9'

* commit '38d044429dabcd28928693240e955c6d4430cca9':
  output example: use the new AVFrame API for allocating the video frame

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3f4edf012593c73941caa0ef9b292da00225c3df'
Michael Niedermayer [Thu, 26 Jun 2014 19:01:18 +0000 (21:01 +0200)]
Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'

* commit '3f4edf012593c73941caa0ef9b292da00225c3df':
  dump_stream: print the timebase as is, do not reduce it

See: 75511c293add07db1cca58dcd8b08c33fc2f1075
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
Michael Niedermayer [Thu, 26 Jun 2014 18:56:23 +0000 (20:56 +0200)]
Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'

* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
  lavc: do not allocate edges in the default get_buffer2()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>