ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Mar 2014 01:51:38 +0000 (02:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aarch64: float_dsp NEON assembler

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c'
Michael Niedermayer [Wed, 19 Mar 2014 01:38:50 +0000 (02:38 +0100)]
Merge commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c'

* commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c':
  libopenjpeg: Support rgba64 decoding

See: b7a928b2d1563575a8d9ec5aa606f735620b38ab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'
Michael Niedermayer [Wed, 19 Mar 2014 00:29:44 +0000 (01:29 +0100)]
Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042'

* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
  libopenjpeg: Support rgba64 encoding

Conflicts:
libavcodec/libopenjpegenc.c

See: 36397ea1c7e27ab850149cc61394c2baa26dd532
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'
Michael Niedermayer [Wed, 19 Mar 2014 00:06:29 +0000 (01:06 +0100)]
Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'

* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
  libopenjpeg: K&R formatting cosmetics

Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAutomatically change MANGLE() into named inline asm operands when direct symbol refer...
Matt Oliver [Tue, 18 Mar 2014 04:53:26 +0000 (15:53 +1100)]
Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

This is part of the patch-set for intel C inline asm on windows support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported
Matt Oliver [Tue, 18 Mar 2014 04:29:14 +0000 (15:29 +1100)]
avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported

This is part of the patch-set for intel C inline asm on windows support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaarch64: float_dsp NEON assembler
Janne Grunau [Sun, 2 Mar 2014 21:54:34 +0000 (22:54 +0100)]
aarch64: float_dsp NEON assembler

Ported from arm NEON and added vector_dmul_scalar.

Functions between 1.5 and 5 times faster than the C implementations
using Apple's clang-503.0.19 on A7.

6 years agoswscale/utils: Fix color range of gray16
Carl Eugen Hoyos [Tue, 18 Mar 2014 02:19:18 +0000 (03:19 +0100)]
swscale/utils: Fix color range of gray16

Improves rgb -> gray16 conversion

Fixes Ticket3422

The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibopenjpeg: Support rgba64 decoding
Vittorio Giovara [Sat, 15 Mar 2014 01:34:48 +0000 (02:34 +0100)]
libopenjpeg: Support rgba64 decoding

6 years agolibopenjpeg: Support rgba64 encoding
Carl Eugen Hoyos [Sat, 14 Jan 2012 01:34:16 +0000 (01:34 +0000)]
libopenjpeg: Support rgba64 encoding

6 years agolibopenjpeg: K&R formatting cosmetics
Vittorio Giovara [Fri, 14 Mar 2014 23:33:20 +0000 (00:33 +0100)]
libopenjpeg: K&R formatting cosmetics

6 years agoavcodec/h264pred_template: fix declarations after statements
Michael Niedermayer [Tue, 18 Mar 2014 19:47:04 +0000 (20:47 +0100)]
avcodec/h264pred_template: fix declarations after statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction
Yogender Kumar Gupta [Tue, 18 Mar 2014 10:31:15 +0000 (16:01 +0530)]
avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction

This is limited to the case where x264_build = -1, to not break x264 decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 18 Mar 2014 19:04:18 +0000 (20:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: add test program and use it as fate test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'
Michael Niedermayer [Tue, 18 Mar 2014 18:58:18 +0000 (19:58 +0100)]
Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'
Michael Niedermayer [Tue, 18 Mar 2014 18:43:20 +0000 (19:43 +0100)]
Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'

* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: reuse COMMON_CORE asm where possible
James Almer [Tue, 18 Mar 2014 03:00:30 +0000 (00:00 -0300)]
swresample: reuse COMMON_CORE asm where possible

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_put_wav_header: remove manual byte counting
Daniel Verkamp [Tue, 18 Mar 2014 07:29:26 +0000 (00:29 -0700)]
ff_put_wav_header: remove manual byte counting

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2
James Almer [Mon, 17 Mar 2014 20:07:34 +0000 (17:07 -0300)]
swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2

pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 18 Mar 2014 13:08:05 +0000 (14:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  svq3: directly set pix_fmt and color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'
Michael Niedermayer [Tue, 18 Mar 2014 12:30:20 +0000 (13:30 +0100)]
Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'

* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
  mpegts: Forward error codes in various functions

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'
Michael Niedermayer [Tue, 18 Mar 2014 12:16:56 +0000 (13:16 +0100)]
Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofloat_dsp: add test program and use it as fate test
Janne Grunau [Mon, 3 Mar 2014 18:15:35 +0000 (19:15 +0100)]
float_dsp: add test program and use it as fate test

6 years agosbrdsp: move #if to disable all educational code
Janne Grunau [Tue, 18 Mar 2014 11:33:13 +0000 (12:33 +0100)]
sbrdsp: move #if to disable all educational code

Avoids a warning of the unused function 'autocorrelate'.

6 years agolavc: er: remove unused variable size
Janne Grunau [Tue, 18 Mar 2014 11:09:07 +0000 (12:09 +0100)]
lavc: er: remove unused variable size

The code using it was removed in d66e305bd1b.

6 years agosvq3: directly set pix_fmt and color_range
Vittorio Giovara [Mon, 17 Mar 2014 17:53:14 +0000 (18:53 +0100)]
svq3: directly set pix_fmt and color_range

6 years agompegts: Forward error codes in various functions
Keiji Costantini [Mon, 17 Mar 2014 17:03:08 +0000 (17:03 +0000)]
mpegts: Forward error codes in various functions

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agompegts: K&R formatting cosmetics
Keiji Costantini [Mon, 17 Mar 2014 17:03:07 +0000 (17:03 +0000)]
mpegts: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoavfilter/src_movie: Check that the pixel format hasnt changed
Michael Niedermayer [Tue, 18 Mar 2014 02:57:41 +0000 (03:57 +0100)]
avfilter/src_movie: Check that the pixel format hasnt changed

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 18 Mar 2014 01:07:20 +0000 (02:07 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add myself az mpegts demuxer maintainer
Marton Balint [Mon, 17 Mar 2014 22:59:36 +0000 (23:59 +0100)]
MAINTAINERS: add myself az mpegts demuxer maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2()
Michael Niedermayer [Mon, 17 Mar 2014 23:07:53 +0000 (00:07 +0100)]
avcodec/utils: fix sizeof(AVFrame) dependence in  avcodec_encode_audio2()

This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix TARGET_SAMPLES and TARGET_PATH for some fate tests.
Carl Eugen Hoyos [Tue, 18 Mar 2014 00:29:50 +0000 (01:29 +0100)]
Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

This allows running more fate tests on remote targets
without the source tree.

6 years agox86/synth_filter: improve FMA version
James Almer [Mon, 17 Mar 2014 19:40:28 +0000 (16:40 -0300)]
x86/synth_filter: improve FMA version

Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples: Add example transcoding.c
Andrey Utkin [Sun, 9 Mar 2014 00:20:41 +0000 (02:20 +0200)]
doc/examples: Add example transcoding.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from...
Michael Niedermayer [Mon, 17 Mar 2014 17:22:32 +0000 (18:22 +0100)]
avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

This also moves mov_rewrite_dvd_sub_extradata() to mov.c

Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: fill in subtitle dimensions after parsing tkhd
Michael Niedermayer [Mon, 17 Mar 2014 17:21:11 +0000 (18:21 +0100)]
avformat/mov: fill in subtitle dimensions after parsing tkhd

Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Mon, 17 Mar 2014 16:08:39 +0000 (17:08 +0100)]
avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Fixes regression with NeroRecodeSample.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: Simplify mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Mon, 17 Mar 2014 16:06:30 +0000 (17:06 +0100)]
avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()

This avoids the 2nd buffer and fixes the palette truncated check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Mar 2014 15:28:07 +0000 (16:28 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: check color_range

Conflicts:
libavcodec/libx264.c

See: 48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'
Michael Niedermayer [Mon, 17 Mar 2014 15:22:28 +0000 (16:22 +0100)]
Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'

* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
  ljpeg: check color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd'
Michael Niedermayer [Mon, 17 Mar 2014 15:13:59 +0000 (16:13 +0100)]
Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd'

* commit '2183432e6dc8aedf1ef3db63006a2a8195479abd':
  mdec: set color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'
Michael Niedermayer [Mon, 17 Mar 2014 15:10:17 +0000 (16:10 +0100)]
Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'

* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
libavcodec/mjpegdec.c

See: 2f870e262e953815060de0ebea9b6653133b203e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'
Michael Niedermayer [Mon, 17 Mar 2014 14:56:49 +0000 (15:56 +0100)]
Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
libavcodec/fraps.c

See: 79f452f4e68696f1daa9f205b35037185959c9ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'
Michael Niedermayer [Mon, 17 Mar 2014 14:54:48 +0000 (15:54 +0100)]
Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
  tiff: Support rgba encoding

Conflicts:
libavcodec/tiffenc.c

See: d7fc100694f776092ce07f616dbe0f02e73f347f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'
Michael Niedermayer [Mon, 17 Mar 2014 14:51:13 +0000 (15:51 +0100)]
Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
libavformat/img2enc.c

See: e8df18270a50fd57eab06f1718ad9d075b200d98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '58c215961a9067bb670387bbd72286c30de04b93'
Michael Niedermayer [Mon, 17 Mar 2014 14:43:21 +0000 (15:43 +0100)]
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'

* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
libavcodec/raw.c
libavformat/nut.c

See: edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
Michael Niedermayer [Mon, 17 Mar 2014 14:32:07 +0000 (15:32 +0100)]
Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'

* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
libavcodec/pngenc.c

See: f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
Michael Niedermayer [Mon, 17 Mar 2014 14:24:05 +0000 (15:24 +0100)]
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'

* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
  png: K&R formatting cosmetics

Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'
Michael Niedermayer [Mon, 17 Mar 2014 13:52:02 +0000 (14:52 +0100)]
Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'

* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'
Michael Niedermayer [Mon, 17 Mar 2014 13:42:37 +0000 (14:42 +0100)]
Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'

* commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8':
  isom: fix C99-style declaration

See: cd0982e1899d24df4f1989ed857de5e477c64763
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
Michael Niedermayer [Mon, 17 Mar 2014 13:14:10 +0000 (14:14 +0100)]
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'

* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c

See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'
Michael Niedermayer [Mon, 17 Mar 2014 12:46:09 +0000 (13:46 +0100)]
Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'

* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
  h264 does not depend on mpegvideo any more

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture
Michael Niedermayer [Mon, 17 Mar 2014 12:35:23 +0000 (13:35 +0100)]
avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'
Michael Niedermayer [Mon, 17 Mar 2014 12:31:28 +0000 (13:31 +0100)]
Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'

* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
  mpegvideo: remove h264-only fields

Conflicts:
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
Michael Niedermayer [Mon, 17 Mar 2014 12:23:48 +0000 (13:23 +0100)]
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dxva2: fix pointers after H264Picture
Michael Niedermayer [Mon, 17 Mar 2014 12:22:40 +0000 (13:22 +0100)]
avcodec/dxva2: fix pointers after H264Picture

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture
Michael Niedermayer [Mon, 17 Mar 2014 11:57:42 +0000 (12:57 +0100)]
avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vaapi: fix pointer types after H264Picture changes
Michael Niedermayer [Mon, 17 Mar 2014 11:45:36 +0000 (12:45 +0100)]
avcodec/vaapi: fix pointer types after H264Picture changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'
Michael Niedermayer [Mon, 17 Mar 2014 11:33:33 +0000 (12:33 +0100)]
Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'
Michael Niedermayer [Mon, 17 Mar 2014 11:24:16 +0000 (12:24 +0100)]
Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'

* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
  h264: Remove MotionEstContext and move the relevant fields to H264Context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'
Michael Niedermayer [Mon, 17 Mar 2014 05:16:18 +0000 (06:16 +0100)]
Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'

* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

Conflicts:
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
Michael Niedermayer [Mon, 17 Mar 2014 04:59:01 +0000 (05:59 +0100)]
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: h264_set_erpic() clear destination
Michael Niedermayer [Mon, 17 Mar 2014 04:52:05 +0000 (05:52 +0100)]
avcodec/h264: h264_set_erpic() clear destination

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
Michael Niedermayer [Mon, 17 Mar 2014 04:49:10 +0000 (05:49 +0100)]
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'

* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
  h264: move relevant fields from Picture to H264Picture

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/error_resilience: fix the case when MVs are not available
Michael Niedermayer [Mon, 17 Mar 2014 04:22:20 +0000 (05:22 +0100)]
avcodec/error_resilience: fix the case when MVs are not available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: ff_mpeg_set_erpic() clear destination
Michael Niedermayer [Mon, 17 Mar 2014 04:13:59 +0000 (05:13 +0100)]
avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination

Fixes crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
Michael Niedermayer [Mon, 17 Mar 2014 03:59:21 +0000 (04:59 +0100)]
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'

* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
  er: move relevant fields from Picture to ERPicture

Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'
Michael Niedermayer [Mon, 17 Mar 2014 03:41:16 +0000 (04:41 +0100)]
Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'

* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e':
  h264: directly use frames in ff_h264_draw_horiz_band()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '75af13a'
Michael Niedermayer [Mon, 17 Mar 2014 03:34:21 +0000 (04:34 +0100)]
Merge commit '75af13a'

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()
Matt Oliver [Mon, 17 Mar 2014 03:00:24 +0000 (04:00 +0100)]
avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: be more tolerant on what pixel format changes trigger reinits
Michael Niedermayer [Mon, 17 Mar 2014 01:25:20 +0000 (02:25 +0100)]
avcodec/h264: be more tolerant on what pixel format changes trigger reinits

Fixes Ticket3260

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd missing external declarations.
Matt Oliver [Sun, 16 Mar 2014 03:40:53 +0000 (14:40 +1100)]
Add missing external declarations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFixed 64bit conformance with mvzbl.
Matt Oliver [Sun, 9 Feb 2014 06:10:12 +0000 (17:10 +1100)]
Fixed 64bit conformance with mvzbl.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/x86/swscale: remove unused constants
Michael Niedermayer [Sun, 16 Mar 2014 23:06:45 +0000 (00:06 +0100)]
swscale/x86/swscale: remove unused constants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: check color_range
Vittorio Giovara [Wed, 12 Mar 2014 11:05:42 +0000 (12:05 +0100)]
libx264: check color_range

6 years agoljpeg: check color_range
Vittorio Giovara [Wed, 12 Mar 2014 13:31:51 +0000 (14:31 +0100)]
ljpeg: check color_range

6 years agomdec: set color_range
Vittorio Giovara [Wed, 12 Mar 2014 13:35:21 +0000 (14:35 +0100)]
mdec: set color_range

6 years agomjpeg: set color_range
Vittorio Giovara [Wed, 12 Mar 2014 09:53:21 +0000 (10:53 +0100)]
mjpeg: set color_range

6 years agofraps: set color_range
Vittorio Giovara [Wed, 12 Mar 2014 10:52:40 +0000 (11:52 +0100)]
fraps: set color_range

6 years agotiff: Support rgba encoding
Carl Eugen Hoyos [Fri, 2 Dec 2011 03:23:07 +0000 (03:23 +0000)]
tiff: Support rgba encoding

6 years agoimg2: add j2c file extension
Jean First [Sun, 22 Jan 2012 00:11:42 +0000 (00:11 +0000)]
img2: add j2c file extension

Some applications use the j2c extension for jpeg2000 codestream files.

6 years agoraw, nut: Support rgba64 encoding
Carl Eugen Hoyos [Thu, 9 Feb 2012 23:25:46 +0000 (23:25 +0000)]
raw, nut: Support rgba64 encoding

6 years agopng: Support rgb48 and rgba64 encoding
Carl Eugen Hoyos [Sun, 15 Jan 2012 22:04:25 +0000 (22:04 +0000)]
png: Support rgb48 and rgba64 encoding

6 years agopng: K&R formatting cosmetics
Vittorio Giovara [Fri, 14 Mar 2014 17:32:00 +0000 (18:32 +0100)]
png: K&R formatting cosmetics

6 years agocodec_desc: update dvaudio tag
Vittorio Giovara [Fri, 14 Mar 2014 18:02:35 +0000 (19:02 +0100)]
codec_desc: update dvaudio tag

6 years agoisom: fix C99-style declaration
Michael Niedermayer [Sun, 16 Mar 2014 12:22:26 +0000 (12:22 +0000)]
isom: fix C99-style declaration

6 years agoRGBA64 pixel formats
Jean First [Fri, 23 Sep 2011 18:26:20 +0000 (20:26 +0200)]
RGBA64 pixel formats

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoh264 does not depend on mpegvideo any more
Vittorio Giovara [Wed, 12 Mar 2014 09:07:46 +0000 (10:07 +0100)]
h264 does not depend on mpegvideo any more

6 years agompegvideo: remove h264-only fields
Vittorio Giovara [Fri, 28 Feb 2014 09:32:46 +0000 (10:32 +0100)]
mpegvideo: remove h264-only fields

6 years agompegvideo: move ff_draw_horiz_band() to mpegutils.c
Vittorio Giovara [Wed, 12 Mar 2014 09:18:54 +0000 (10:18 +0100)]
mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Drop the mpegvideo dependency for svq3 in configure.

6 years agompegvideo: move mpegvideo formats-related defines to mpegutils.h
Vittorio Giovara [Fri, 28 Feb 2014 12:40:54 +0000 (13:40 +0100)]
mpegvideo: move mpegvideo formats-related defines to mpegutils.h

6 years agoh264: Remove MotionEstContext and move the relevant fields to H264Context
Vittorio Giovara [Thu, 27 Feb 2014 17:43:28 +0000 (18:43 +0100)]
h264: Remove MotionEstContext and move the relevant fields to H264Context

Unused buffers scratchpad and temp have been dropped too.

6 years agoh264: Replace mpegvideo-specific MAX_THREADS by private define
Vittorio Giovara [Fri, 28 Feb 2014 12:21:59 +0000 (13:21 +0100)]
h264: Replace mpegvideo-specific MAX_THREADS by private define

6 years agoh264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Vittorio Giovara [Thu, 27 Feb 2014 16:07:30 +0000 (17:07 +0100)]
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

6 years agoh264: move relevant fields from Picture to H264Picture
Vittorio Giovara [Wed, 12 Mar 2014 08:13:07 +0000 (09:13 +0100)]
h264: move relevant fields from Picture to H264Picture

6 years agoer: move relevant fields from Picture to ERPicture
Vittorio Giovara [Fri, 28 Feb 2014 10:31:56 +0000 (11:31 +0100)]
er: move relevant fields from Picture to ERPicture

This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().

6 years agoh264: directly use frames in ff_h264_draw_horiz_band()
Vittorio Giovara [Tue, 4 Mar 2014 14:30:19 +0000 (15:30 +0100)]
h264: directly use frames in ff_h264_draw_horiz_band()

6 years agompegvideo: directly use frames in ff_draw_horiz_band()
Vittorio Giovara [Tue, 4 Mar 2014 11:02:27 +0000 (12:02 +0100)]
mpegvideo: directly use frames in ff_draw_horiz_band()

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Mar 2014 21:38:00 +0000 (22:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Lower the number of frames required to detect ADTS

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