ffmpeg.git
3 years agoconfigure: add missing h263p decoder dependencies
James Almer [Sun, 12 Apr 2015 18:42:38 +0000 (15:42 -0300)]
configure: add missing h263p decoder dependencies

Should fix ticket #4480

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agofate: Include branch information in the payload header
Timothy Gu [Sun, 12 Apr 2015 15:28:42 +0000 (08:28 -0700)]
fate: Include branch information in the payload header

The server is properly equiped not to choke on that now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/rtpdec_asf: Fix potential pointer overflow
Michael Niedermayer [Sun, 12 Apr 2015 15:41:23 +0000 (17:41 +0200)]
avformat/rtpdec_asf: Fix potential pointer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/segafilm: Use av_malloc_array()
Michael Niedermayer [Sun, 12 Apr 2015 14:52:00 +0000 (16:52 +0200)]
avformat/segafilm: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/sierravmd: use av_malloc_array()
Michael Niedermayer [Sun, 12 Apr 2015 14:50:19 +0000 (16:50 +0200)]
avformat/sierravmd: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavfilter: add chorus filter
Paul B Mahol [Tue, 24 Jun 2014 08:35:37 +0000 (08:35 +0000)]
avfilter: add chorus filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolibavformat/mxfenc: added support mxf opatom audio muxing
Mark Reid [Sun, 12 Apr 2015 00:18:13 +0000 (17:18 -0700)]
libavformat/mxfenc: added support mxf opatom audio muxing

Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agofate: Add atrac3+ tests
Timothy Gu [Fri, 10 Apr 2015 20:24:57 +0000 (13:24 -0700)]
fate: Add atrac3+ tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibavformat/http.c: Make http-listen work as an input stream.
Stephan Holljes [Sat, 11 Apr 2015 20:26:57 +0000 (22:26 +0200)]
libavformat/http.c: Make http-listen work as an input stream.

With this patch http can be used to listen for POST data to be used as an input stream.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/rtpproto: Move dscp into context & AVOptions
Michael Niedermayer [Sat, 11 Apr 2015 16:53:54 +0000 (18:53 +0200)]
avformat/rtpproto: Move dscp into context & AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'
Michael Niedermayer [Sat, 11 Apr 2015 15:59:39 +0000 (17:59 +0200)]
Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'

* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
  libx265: print supported presets and tunes on error

See: 61090db29a3e8364431d46c16770425815f7608a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
Michael Niedermayer [Sat, 11 Apr 2015 15:47:19 +0000 (17:47 +0200)]
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'

* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
  libdc1394: Unbreak build after c201069fa

See: fe25194c5870f21ba10f615f036b64d0c84fca48
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibx265: print supported presets and tunes on error
James Almer [Fri, 10 Apr 2015 19:47:03 +0000 (16:47 -0300)]
libx265: print supported presets and tunes on error

Based on code from libavcodec/libx264.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavformat/xwma: Use av_malloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:51:03 +0000 (13:51 +0200)]
avformat/xwma: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/wtvenc: Use av_realloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:50:07 +0000 (13:50 +0200)]
avformat/wtvenc: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/nsvdec: Use av_malloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:18:41 +0000 (13:18 +0200)]
avformat/nsvdec: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibdc1394: Unbreak build after c201069fa
Michael Kostylev [Sat, 11 Apr 2015 08:37:49 +0000 (10:37 +0200)]
libdc1394: Unbreak build after c201069fa

3 years agortpenc_jpeg: handle case of picture dimensions not dividing by 8
Andrey Utkin [Fri, 10 Apr 2015 21:54:10 +0000 (00:54 +0300)]
rtpenc_jpeg: handle case of picture dimensions not dividing by 8

This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '4f373a5111f900af54301907132942f95276285c'
Michael Niedermayer [Fri, 10 Apr 2015 23:35:16 +0000 (01:35 +0200)]
Merge commit '4f373a5111f900af54301907132942f95276285c'

* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
libavdevice/vfwcap.c

See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agodoc: add aarch64 cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:52:29 +0000 (20:52 -0300)]
doc: add aarch64 cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agodoc: add missing arm cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:51:35 +0000 (20:51 -0300)]
doc: add missing arm cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agodoc: add missing x86 cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:51:11 +0000 (20:51 -0300)]
doc: add missing x86 cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoUse @verbatim instead of @example for ASCII arts
Timothy Gu [Mon, 23 Mar 2015 03:47:17 +0000 (20:47 -0700)]
Use @verbatim instead of @example for ASCII arts

Partially fixes #3869.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agotexi2pod: Handle @verbatim
Timothy Gu [Fri, 10 Apr 2015 17:47:55 +0000 (10:47 -0700)]
texi2pod: Handle @verbatim

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agovfwcap: Unbreak building after c201069fa
Martin Storsjö [Fri, 10 Apr 2015 09:22:33 +0000 (12:22 +0300)]
vfwcap: Unbreak building after c201069fa

These headers can't be included in any arbitrary order.

Signed-off-by: Martin Storsjö <martin@martin.st>
3 years agotests: Do not include stdout/stderr or diff if the test passed
Timothy Gu [Fri, 10 Apr 2015 17:51:11 +0000 (10:51 -0700)]
tests: Do not include stdout/stderr or diff if the test passed

FATE currently discards this information anyway, so why waste the
disk space?

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoAdd cabac test into fate
Timothy Gu [Fri, 10 Apr 2015 17:27:35 +0000 (10:27 -0700)]
Add cabac test into fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agocabac-test: Return 1 if there are any errors
Timothy Gu [Fri, 10 Apr 2015 17:27:34 +0000 (10:27 -0700)]
cabac-test: Return 1 if there are any errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/libx265: print supported presets and tunes on error
James Almer [Fri, 10 Apr 2015 19:47:03 +0000 (16:47 -0300)]
avcodec/libx265: print supported presets and tunes on error

Based on code from libavcodec/libx264.c

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/h264: Do not fail with randomly truncated VUIs
Michael Niedermayer [Fri, 10 Apr 2015 16:35:07 +0000 (18:35 +0200)]
avcodec/h264: Do not fail with randomly truncated VUIs

Fixes Ticket4445

Tested-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200
Michael Niedermayer [Fri, 10 Apr 2015 16:08:52 +0000 (18:08 +0200)]
avdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200

This should fix build on vs2013

Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoffmdec: Check return value of ffm_append_recommended_configuration
Himangi Saraogi [Wed, 8 Apr 2015 22:55:04 +0000 (04:25 +0530)]
ffmdec: Check return value of ffm_append_recommended_configuration

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/rtsp: Fix unchecked return value
Himangi Saraogi [Thu, 9 Apr 2015 18:34:01 +0000 (00:04 +0530)]
avformat/rtsp: Fix unchecked return value

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 10 Apr 2015 11:35:59 +0000 (13:35 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/flac: Autodetect raw flac files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavutil/mips/intreadwrite: build fix for mips64r6 (instruction 'lwl' not supported)
Shivraj Patil [Thu, 9 Apr 2015 14:24:04 +0000 (19:54 +0530)]
avutil/mips/intreadwrite: build fix for mips64r6 (instruction 'lwl' not supported)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoconfigure: add support for 74kf cpu
Shivraj Patil [Thu, 9 Apr 2015 14:21:40 +0000 (19:51 +0530)]
configure: add support for 74kf cpu

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoconfigure: add support for mips64r6 and i6400 cpu
Shivraj Patil [Thu, 9 Apr 2015 14:20:13 +0000 (19:50 +0530)]
configure: add support for mips64r6 and i6400 cpu

This is a preparation patch to submit optimized code for MSA (MIPS-SIMD-Architecture)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoconfigure: add support for mips32r5, p5600 cpu and msa
Shivraj Patil [Thu, 9 Apr 2015 14:16:24 +0000 (19:46 +0530)]
configure: add support for mips32r5, p5600 cpu and msa

Imagination Technologies has come up with MIPS Warrior Processor Cores.
More details can be found at-
http://www.imgtec.com/mips/warrior/pclass.asp
http://www.imgtec.com/mips/warrior/iclass.asp

This is a preparation patch to submit optimized code for MSA (MIPS-SIMD-Architecture)
This patch set is adding support for P5600 and I6400 CPUs.

MIPS 'generic' case is added, with mips32r2 arch as default (fpu and dsp opt enabled).

Sample configurations for new MSA architectures-
    $ ./configure --enable-cross-compile --cross-prefix=<PATH> --arch=mips --target-os=linux --cpu=p5600
    $ ./configure --enable-cross-compile --cross-prefix=<PATH> --arch=mips --target-os=linux --cpu=i6400

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/hqx: Use av_clip_uintp2()
Michael Niedermayer [Fri, 10 Apr 2015 10:32:44 +0000 (12:32 +0200)]
avcodec/hqx: Use av_clip_uintp2()

Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolavf/flac: Autodetect raw flac files.
Carl Eugen Hoyos [Fri, 10 Apr 2015 10:35:02 +0000 (12:35 +0200)]
lavf/flac: Autodetect raw flac files.

3 years agoavcodec/libdcadec: honor AVCodecContext bitexact flag
James Almer [Thu, 9 Apr 2015 06:56:58 +0000 (03:56 -0300)]
avcodec/libdcadec: honor AVCodecContext bitexact flag

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/hqx: multi threading support
Ferdinand Oeinck [Mon, 6 Apr 2015 13:47:14 +0000 (15:47 +0200)]
libavcodec/hqx: multi threading support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
Michael Niedermayer [Thu, 9 Apr 2015 19:36:42 +0000 (21:36 +0200)]
Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
libavdevice/Makefile
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/sndio_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavdevice/vfwcap: put the headers back in the order in which they need to be
Michael Niedermayer [Thu, 9 Apr 2015 19:18:51 +0000 (21:18 +0200)]
avdevice/vfwcap: put the headers back in the order in which they need to be

This avoids build failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
Michael Niedermayer [Thu, 9 Apr 2015 19:03:39 +0000 (21:03 +0200)]
Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
  avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '27852f2f1dec3749ea79883b70484c841169f747'
Michael Niedermayer [Thu, 9 Apr 2015 18:47:20 +0000 (20:47 +0200)]
Merge commit '27852f2f1dec3749ea79883b70484c841169f747'

* commit '27852f2f1dec3749ea79883b70484c841169f747':
  libavformat: Handle error return from ff_listen_bind

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'
Michael Niedermayer [Thu, 9 Apr 2015 18:39:56 +0000 (20:39 +0200)]
Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'

* commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589':
  hqx: Fix clipping error in idct put function

See: 92f94fd5dd8b256c5633eda655dda4782eca2ad8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
Michael Niedermayer [Thu, 9 Apr 2015 18:33:06 +0000 (20:33 +0200)]
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'

* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
  riff: Add 'M705' FourCC for mpeg2video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'
Michael Niedermayer [Thu, 9 Apr 2015 18:26:07 +0000 (20:26 +0200)]
Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'

* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
  dnxhd: Log the selected profile id

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'
Michael Niedermayer [Thu, 9 Apr 2015 18:17:36 +0000 (20:17 +0200)]
Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'

* commit 'be089af38f65dc8b1fe3564f98020fc815577edb':
  mov: Rely on box type rather than file type for colr atom

Conflicts:
libavformat/mov.c

See: 0276b9524294e518cdc7cbfa12b7cb301ed86fb6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'
Michael Niedermayer [Thu, 9 Apr 2015 18:08:58 +0000 (20:08 +0200)]
Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'

* commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b':
  v210: Fix typo in header guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/nvenc: Add options for level and tier
Timo Rothenpieler [Sat, 4 Apr 2015 11:34:14 +0000 (13:34 +0200)]
avcodec/nvenc: Add options for level and tier

Previous version reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/h264: Use only one ERContext
Michael Niedermayer [Sat, 4 Apr 2015 10:36:43 +0000 (12:36 +0200)]
avcodec/h264: Use only one ERContext

This fixes slice threads with error concealment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavdevice: Apply a more consistent file naming scheme
Diego Biurrun [Fri, 27 Mar 2015 11:40:23 +0000 (12:40 +0100)]
avdevice: Apply a more consistent file naming scheme

3 years agoavdevice: Add missing header for NULL_IF_CONFIG_SMALL
Diego Biurrun [Wed, 8 Apr 2015 15:27:42 +0000 (17:27 +0200)]
avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Also reshuffle headers into canonical order where appropriate.

3 years agolibavformat: Handle error return from ff_listen_bind
Anders Nystrom [Thu, 9 Apr 2015 00:38:41 +0000 (02:38 +0200)]
libavformat: Handle error return from ff_listen_bind

Handle error return from ff_listen_bind without leaking file descriptors.

Signed-off-by: Anders Nystrom <anders.nystrom@southpole.se>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agohqx: Fix clipping error in idct put function
Ferdinand Oeinck [Tue, 7 Apr 2015 10:42:17 +0000 (12:42 +0200)]
hqx: Fix clipping error in idct put function

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agoriff: Add 'M705' FourCC for mpeg2video
Vittorio Giovara [Tue, 7 Apr 2015 10:30:16 +0000 (12:30 +0200)]
riff: Add 'M705' FourCC for mpeg2video

3 years agodnxhd: Log the selected profile id
Vittorio Giovara [Thu, 2 Apr 2015 20:56:39 +0000 (22:56 +0200)]
dnxhd: Log the selected profile id

3 years agoavcodec/h264: Be more tolerant to changing pps id between slices
Michael Niedermayer [Thu, 9 Apr 2015 11:50:07 +0000 (13:50 +0200)]
avcodec/h264: Be more tolerant to changing pps id between slices

Fixes Ticket4446

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agomov: Rely on box type rather than file type for colr atom
Vittorio Giovara [Mon, 23 Mar 2015 19:43:27 +0000 (19:43 +0000)]
mov: Rely on box type rather than file type for colr atom

Although it's not allowed to use only allows 'nclc' in ISOM files, there
are samples that do not always respect this rule. This change prevents
atom overread and a spurious color range initialization.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agov210: Fix typo in header guards
Vittorio Giovara [Mon, 23 Mar 2015 20:13:43 +0000 (20:13 +0000)]
v210: Fix typo in header guards

3 years agoavfilter/vsrc_life: Fix mix of declarations and statements
Michael Niedermayer [Thu, 9 Apr 2015 09:05:43 +0000 (11:05 +0200)]
avfilter/vsrc_life: Fix mix of declarations and statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agovda: Cast to not discard constant qualifier and silence compiler warning
Himangi Saraogi [Wed, 8 Apr 2015 22:10:31 +0000 (03:40 +0530)]
vda: Cast to not discard constant qualifier and silence compiler warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavutil/x86/Makefile: fix conditional x86/emms.o build
Michael Niedermayer [Wed, 8 Apr 2015 23:01:12 +0000 (01:01 +0200)]
avutil/x86/Makefile: fix conditional x86/emms.o build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/aacdec: Fix storing state before PCE decode
Michael Niedermayer [Wed, 8 Apr 2015 22:04:44 +0000 (00:04 +0200)]
avcodec/aacdec: Fix storing state before PCE decode

Fixes Ticket4460

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/h264_ps: Move truncation check from VUI to SPS
Michael Niedermayer [Wed, 8 Apr 2015 20:18:35 +0000 (22:18 +0200)]
avcodec/h264_ps: Move truncation check from VUI to SPS

This more completely checks for truncation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agomicrodvd: do not export framerate hint as subtitle packet
wm4 [Wed, 8 Apr 2015 17:55:04 +0000 (19:55 +0200)]
microdvd: do not export framerate hint as subtitle packet

MicroDVD has a "hack" for specifying the video framerate the subtitle
was authored against. The demuxer reads this hint correctly, but didn't
skip it correctly.

This was not noticed, because the exported packet has its duration set
to 0, making it invisible (depending on the API user's rendering logic).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'
Michael Niedermayer [Wed, 8 Apr 2015 18:48:29 +0000 (20:48 +0200)]
Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'

* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d':
  g2meet: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'
Michael Niedermayer [Wed, 8 Apr 2015 18:36:44 +0000 (20:36 +0200)]
Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

* commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909':
  matroskadec: export cover art correctly

Conflicts:
libavformat/matroskadec.c

See: 511585ce7f7272e5069ef011d6be5f073d268901
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolavf/apngenc: Do not print a warning in the normal use-case.
Carl Eugen Hoyos [Wed, 8 Apr 2015 17:58:32 +0000 (19:58 +0200)]
lavf/apngenc: Do not print a warning in the normal use-case.

3 years agoavutil/x86/Makefile: Make building and linking of emms.c conditional
Ronald S. Bultje [Wed, 8 Apr 2015 15:17:24 +0000 (17:17 +0200)]
avutil/x86/Makefile: Make building and linking of emms.c conditional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavfilter: handle error in query_formats() in bunch of filters
Paul B Mahol [Fri, 3 Apr 2015 17:55:18 +0000 (17:55 +0000)]
avfilter: handle error in query_formats() in bunch of filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavformat/libquvi: Fix whitelist handling
Gilles Chanteperdrix [Wed, 8 Apr 2015 12:38:11 +0000 (14:38 +0200)]
avformat/libquvi: Fix whitelist handling

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agog2meet: K&R formatting cosmetics
Diego Biurrun [Fri, 10 Oct 2014 08:52:03 +0000 (10:52 +0200)]
g2meet: K&R formatting cosmetics

3 years agoavcodec/h264_slice: Fix uninitialized variable
Michael Niedermayer [Wed, 8 Apr 2015 11:05:38 +0000 (13:05 +0200)]
avcodec/h264_slice: Fix uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agomatroskadec: export cover art correctly
wm4 [Fri, 3 Apr 2015 14:11:53 +0000 (16:11 +0200)]
matroskadec: export cover art correctly

Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.

Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.

Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoavcodec/h264_slice: Dont reset mb_aff_frame per slice
Michael Niedermayer [Wed, 8 Apr 2015 10:29:47 +0000 (12:29 +0200)]
avcodec/h264_slice: Dont reset mb_aff_frame per slice

Fixes null pointer dereference
Fixes Ticket4440

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/h264: use consistent argument name in MB_FIELD() macro
Michael Niedermayer [Wed, 8 Apr 2015 10:27:09 +0000 (12:27 +0200)]
avcodec/h264: use consistent argument name in MB_FIELD() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibavcodec/hqx: correct clipping error
ferdo@bigroses.nl [Tue, 7 Apr 2015 10:42:17 +0000 (12:42 +0200)]
libavcodec/hqx: correct clipping error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/segment: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Tue, 7 Apr 2015 21:21:48 +0000 (23:21 +0200)]
avformat/segment: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/ape: Use av_malloc_array()
Michael Niedermayer [Tue, 7 Apr 2015 20:50:07 +0000 (22:50 +0200)]
avformat/ape: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavformat/asfenc: Check for index_ptr allocation failure
Michael Niedermayer [Tue, 7 Apr 2015 20:29:54 +0000 (22:29 +0200)]
avformat/asfenc: Check for index_ptr allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agowebmdashenc: Fix fate in MSVC
Vignesh Venkatasubramanian [Tue, 7 Apr 2015 19:21:02 +0000 (12:21 -0700)]
webmdashenc: Fix fate in MSVC

MSVC does not support the %F and %T format specifiers in strftime.
Replace that with the expanded version. This fixes the broken fate
tests in MSVC (webm-dash-manifest-*).

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
Michael Niedermayer [Tue, 7 Apr 2015 18:34:24 +0000 (20:34 +0200)]
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'

* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae':
  parseutils: Make av_small_strptime public

Conflicts:
doc/APIchanges
libavformat/utils.c
libavutil/parseutils.c
libavutil/version.h

See: 29e972f67c914d35417bc7368493d2617abdd26e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '108f2f381acb93827fb4add0517eeae859afa3bf'
Michael Niedermayer [Tue, 7 Apr 2015 17:58:31 +0000 (19:58 +0200)]
Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'

* commit '108f2f381acb93827fb4add0517eeae859afa3bf':
  parseutils: Extend small_strptime to be used in avformat

Conflicts:
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolavf: Add support for WebM Live Muxing
Vignesh Venkatasubramanian [Mon, 30 Mar 2015 21:46:10 +0000 (14:46 -0700)]
lavf: Add support for WebM Live Muxing

This patch adds support for WebM Live Muxing by adding a new WebM
Chunk muxer. It writes out live WebM Chunks which can be used for
playback using Live DASH Clients.

Please see muxers.texi for sample usage.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoparseutils: Make av_small_strptime public
Luca Barbato [Sun, 5 Apr 2015 23:45:37 +0000 (01:45 +0200)]
parseutils: Make av_small_strptime public

And use it in libavformat.

Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.

3 years agoavcodec/h264: finish previous slices before switching to single thread mode
Michael Niedermayer [Tue, 7 Apr 2015 00:47:36 +0000 (02:47 +0200)]
avcodec/h264: finish previous slices before switching to single thread mode

Fixes null pointer dereference
Fixes Ticket4438

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/h264: Fix race between slices where one overwrites data from the next
Michael Niedermayer [Mon, 6 Apr 2015 22:40:21 +0000 (00:40 +0200)]
avcodec/h264: Fix race between slices where one overwrites data from the next

Fixes non deterministic crash in ticket4408/fuzz2.264
Likely fixes other samples as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agotests/fate/mpeg4: add bitexact flag so as to avoid the version number from being...
Michael Niedermayer [Mon, 6 Apr 2015 21:00:16 +0000 (23:00 +0200)]
tests/fate/mpeg4: add bitexact flag so as to avoid the version number from being included in the checksum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agofate: add mpeg4_unpack_bframes bsf test
Andreas Cadhalpun [Sun, 5 Apr 2015 16:51:55 +0000 (18:51 +0200)]
fate: add mpeg4_unpack_bframes bsf test

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibavformat/http.c: Fix missing parenthesis in http_listen()
Stephan Holljes [Mon, 6 Apr 2015 17:26:34 +0000 (19:26 +0200)]
libavformat/http.c: Fix missing parenthesis in http_listen()

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMAINTAINERS: Add Lou Logan as server admin as he is root too
Michael Niedermayer [Mon, 6 Apr 2015 18:21:43 +0000 (20:21 +0200)]
MAINTAINERS: Add Lou Logan as server admin as he is root too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptions
Michael Niedermayer [Mon, 6 Apr 2015 16:18:41 +0000 (18:18 +0200)]
avcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoparseutils: Extend small_strptime to be used in avformat
Luca Barbato [Sun, 5 Apr 2015 23:25:52 +0000 (01:25 +0200)]
parseutils: Extend small_strptime to be used in avformat

The strptime implementation is supposed to support whitespace and %T.

3 years agoexamples/avio_list_dir: init/deinit network
Lukasz Marek [Fri, 3 Apr 2015 21:55:21 +0000 (23:55 +0200)]
examples/avio_list_dir: init/deinit network

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
3 years agoavcodec/vc1dec: Check buf2 for malloc failure
Michael Niedermayer [Mon, 6 Apr 2015 13:06:42 +0000 (15:06 +0200)]
avcodec/vc1dec: Check buf2 for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavfilter/af_amix: Use av_mallocz_array()
Michael Niedermayer [Mon, 6 Apr 2015 13:04:38 +0000 (15:04 +0200)]
avfilter/af_amix: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavfilter/vsrc_mptestsrc: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 6 Apr 2015 12:45:17 +0000 (14:45 +0200)]
avfilter/vsrc_mptestsrc: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

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