Michael Niedermayer
f944aeb07a
avformat/rtpproto: Move dscp into context & AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 18:53:54 +02:00
Michael Niedermayer
816bbc1cf5
Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'
...
* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
libx265: print supported presets and tunes on error
See: 61090db29a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 18:00:16 +02:00
Michael Niedermayer
6530e2ff0c
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
...
* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
libdc1394: Unbreak build after c201069fa
See: fe25194c58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 17:59:21 +02:00
James Almer
bbdb50d7a8
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>
2015-04-11 11:13:28 -04:00
Michael Niedermayer
d6bcdf0dcd
avformat/xwma: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:51:03 +02:00
Michael Niedermayer
e33355213d
avformat/wtvenc: Use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:50:50 +02:00
Michael Niedermayer
e0d8ff5ef1
avformat/nsvdec: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:18:41 +02:00
Michael Kostylev
7a9b764c07
libdc1394: Unbreak build after c201069fa
2015-04-11 10:57:18 +02:00
Andrey Utkin
7f64a7503b
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>
2015-04-11 02:26:56 +02:00
Michael Niedermayer
d4a6c94046
Merge commit '4f373a5111f900af54301907132942f95276285c'
...
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 02:19:32 +02:00
James Almer
9fc45681e0
doc: add aarch64 cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:19 -03:00
James Almer
666ec9bd09
doc: add missing arm cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:15 -03:00
James Almer
410c93cfd5
doc: add missing x86 cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:11 -03:00
Timothy Gu
3d6069d01c
Use @verbatim instead of @example for ASCII arts
...
Partially fixes #3869 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 01:14:51 +02:00
Timothy Gu
5faca08caf
texi2pod: Handle @verbatim
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 01:00:07 +02:00
Martin Storsjö
4f373a5111
vfwcap: Unbreak building after c201069fa
...
These headers can't be included in any arbitrary order.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-11 00:15:47 +03:00
Timothy Gu
1a562adb01
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>
2015-04-10 22:20:36 +02:00
Timothy Gu
28e2bf90b9
Add cabac test into fate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 21:49:37 +02:00
Timothy Gu
744594685e
cabac-test: Return 1 if there are any errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 21:49:37 +02:00
James Almer
61090db29a
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>
2015-04-10 16:47:29 -03:00
Michael Niedermayer
bc48c88918
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>
2015-04-10 18:35:07 +02:00
Michael Niedermayer
4d0f6d3fb4
avdevice/vfwcap: revert header reordering from c201069fac
...
This should fix build on vs2013
Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 18:09:26 +02:00
Himangi Saraogi
8d15de7eb2
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>
2015-04-10 14:44:53 +02:00
Himangi Saraogi
aae9f52c4e
avformat/rtsp: Fix unchecked return value
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 14:18:11 +02:00
Michael Niedermayer
5d0f836f62
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/flac: Autodetect raw flac files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 13:36:03 +02:00
Shivraj Patil
578d99e7c6
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>
2015-04-10 13:03:44 +02:00
Shivraj Patil
7fdd31421c
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>
2015-04-10 13:03:10 +02:00
Shivraj Patil
076bfe9612
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>
2015-04-10 13:01:34 +02:00
Shivraj Patil
8af3ce5378
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>
2015-04-10 12:59:47 +02:00
Michael Niedermayer
599dc8fee1
avcodec/hqx: Use av_clip_uintp2()
...
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 12:38:03 +02:00
Carl Eugen Hoyos
7b39d853b8
lavf/flac: Autodetect raw flac files.
2015-04-10 12:35:02 +02:00
James Almer
3553b815f6
avcodec/libdcadec: honor AVCodecContext bitexact flag
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-09 22:37:39 -03:00
Ferdinand Oeinck
eff72a6c73
libavcodec/hqx: multi threading support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 03:11:40 +02:00
Michael Niedermayer
b1b58310d0
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>
2015-04-09 21:36:42 +02:00
Michael Niedermayer
259fd4c7cf
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>
2015-04-09 21:19:49 +02:00
Michael Niedermayer
fe25194c58
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>
2015-04-09 21:07:24 +02:00
Michael Niedermayer
71288bf80f
Merge commit '27852f2f1dec3749ea79883b70484c841169f747'
...
* commit '27852f2f1dec3749ea79883b70484c841169f747':
libavformat: Handle error return from ff_listen_bind
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:58:11 +02:00
Michael Niedermayer
7ef59803e8
Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'
...
* commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589':
hqx: Fix clipping error in idct put function
See: 92f94fd5dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:40:48 +02:00
Michael Niedermayer
e77270cd93
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
...
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
riff: Add 'M705' FourCC for mpeg2video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:33:51 +02:00
Michael Niedermayer
72a580268f
Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'
...
* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
dnxhd: Log the selected profile id
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:26:18 +02:00
Michael Niedermayer
98c7d305a7
Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'
...
* commit 'be089af38f65dc8b1fe3564f98020fc815577edb':
mov: Rely on box type rather than file type for colr atom
Conflicts:
libavformat/mov.c
See: 0276b95242
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:19:27 +02:00
Michael Niedermayer
9fd3d9acf7
Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'
...
* commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b':
v210: Fix typo in header guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 20:09:10 +02:00
Timo Rothenpieler
7b0689c55f
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>
2015-04-09 18:20:26 +02:00
Michael Niedermayer
7be2d2a70c
avcodec/h264: Use only one ERContext
...
This fixes slice threads with error concealment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 17:42:04 +02:00
Diego Biurrun
8d26c193fb
avdevice: Apply a more consistent file naming scheme
2015-04-09 16:40:12 +02:00
Diego Biurrun
c201069fac
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
...
Also reshuffle headers into canonical order where appropriate.
2015-04-09 16:40:12 +02:00
Anders Nystrom
27852f2f1d
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>
2015-04-09 14:32:37 +02:00
Ferdinand Oeinck
0266988ccd
hqx: Fix clipping error in idct put function
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-09 13:52:04 +02:00
Vittorio Giovara
783df7d5c5
riff: Add 'M705' FourCC for mpeg2video
2015-04-09 13:52:04 +02:00
Vittorio Giovara
5980c924e3
dnxhd: Log the selected profile id
2015-04-09 13:51:58 +02:00