1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

71622 Commits

Author SHA1 Message Date
Rodger Combs
a4d58c97d0 lavf/http: handle case where the server returns a redirect during a seek
txoffer (e.g. http://tori.aoi-chan.com/ ) redirects to the same URI on your
first request, and serves the actual file on the second. It's stupid, but AFAIK
technically compliant. We'd previously see the server not handing back a Range
header and return an error; now, instead, we see that there's a redirect and
keep track of the offset we want while trying again at the new URL.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 11:18:50 +02:00
Rostislav Pehlivanov
f7f71b5795 aacenc: Add support for Perceptual Noise Substitution energy values
This commit implements support for writing the noise energy values used in PNS.
The difference between regular scalefactors and noise energy values is that the latter
require a small preamble (NOISE_PRE + energy_value_diff) to be written as the first
noise-containing band. Any following noise energy values use the previous one to
base their "diff" on. Ordinary scalefactors remain unchanged other than that they ignore the noise values.

This commit should not change anything by itself, the following commits will bring it in use.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 04:14:27 +02:00
Mark Reid
c919cc61a1 tests/fate: added mxf opatom audio regression tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 02:08:46 +02:00
Michael Niedermayer
818e889709 Merge commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e'
* commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e':
  rtsp: Fix unchecked return value

See: aae9f52c4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 01:44:36 +02:00
Michael Niedermayer
4dd0c07122 Merge commit '0b72a47f5592ecc035edd5bac57558ad9604612d'
* commit '0b72a47f5592ecc035edd5bac57558ad9604612d':
  rtsp: Check a malloc return value

See: 4b03002527
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 01:35:08 +02:00
Himangi Saraogi
f03dfe118b avformat/rtsp: Fix dereference after null check
This fixes CID 732219

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 23:31:55 +02:00
Michael Niedermayer
ff50b1b13b swresample/swresample-test: Randomly wipe out channel counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:53 +02:00
Michael Niedermayer
3c77bb5f23 swresample: Check channel layouts and channels against each other and print human readable error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:34 +02:00
Michael Niedermayer
80a28c7509 swresample: Allow reinitialization without ever setting channel layouts 2015-04-12 22:21:34 +02:00
Michael Niedermayer
d7b9cb2f7a swresample: Allow reinitialization without ever setting channel counts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:34 +02:00
Himangi Saraogi
4e54432164 rtsp: Fix unchecked return value
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-12 23:08:14 +03:00
Himangi Saraogi
0b72a47f55 rtsp: Check a malloc return value
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-12 23:08:13 +03:00
James Almer
14edc9f3a3 configure: add missing h263p decoder dependencies
Should fix ticket #4480

Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-12 15:48:55 -03:00
Timothy Gu
7ad27f1221 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>
2015-04-12 18:02:23 +02:00
Michael Niedermayer
445a02b1ec avformat/rtpdec_asf: Fix potential pointer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:41:23 +02:00
Michael Niedermayer
870ec3f69e avformat/segafilm: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:14:20 +02:00
Michael Niedermayer
4270a9f547 avformat/sierravmd: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:14:20 +02:00
Paul B Mahol
d2fc702ace avfilter: add chorus filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-11 20:39:43 +00:00
Mark Reid
415f1fab8d 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>
2015-04-12 02:40:09 +02:00
Timothy Gu
a202fe00ab fate: Add atrac3+ tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 00:15:58 +02:00
Stephan Holljes
b51027fd18 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>
2015-04-11 23:10:44 +02:00
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