1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

42568 Commits

Author SHA1 Message Date
Michael Niedermayer
9db747b2a3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
  configure: Move the getaddrinfo function check into the network block
  configure: Remove an unused 'have' item
  mpeg: remove disabled code
  libfdk-aac: Check if cutoff value is valid
  network: Always use our version of gai_strerror on windows
  network: Undefine existing gai_strerror definitions
  network: Extend the fallback gai_strerror implementation to handle more error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 20:45:41 +02:00
Michael Niedermayer
5dba4cbc2f ffmpeg: fix streamcopy of some mp3 in avi
Fixes Ticket1432

Thanks-to: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com> for some of the bug analysis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 16:56:03 +02:00
Michael Niedermayer
b45a313e97 ffv1dec: fix error concealment for gop>1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 16:48:09 +02:00
Nick Brereton
e03077c432 Fix DCA-XXCH extension scaling for embedded downmixes.
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 16:06:01 +02:00
Nick Brereton
73154feec1 Fix ordering of XXCH downmix coefficients.
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 16:05:25 +02:00
Michael Niedermayer
ac9389a663 ffv1dec: detect errors in bytestream end mismatches for EC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 15:48:04 +02:00
Michael Niedermayer
b0d674ec10 ffv1dec: set the first slices bytestream end correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 15:48:04 +02:00
Michael Niedermayer
f5af3568f6 ffv1dec: keep track of errors in slice headers for EC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 15:48:04 +02:00
Michael Niedermayer
094845aad8 ffv1dec: add simple error concealment in case of CRC errors on slices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 15:48:04 +02:00
Michael Niedermayer
371d37fcf5 ffv1: keep last_frame (to be used for error concealment)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 15:38:27 +02:00
Michael Niedermayer
8486c8cc9a configure: print if the docs building tools have been found
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 14:45:41 +02:00
Tim Nicholson
45641014d3 doc/filters: Fix two typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 14:01:01 +02:00
Jordi Ortiz
08e087ccf7 rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2012-07-16 13:45:15 +02:00
Martin Storsjö
f06dee7794 configure: Move the getaddrinfo function check into the network block
This makes the two checks (general vs winsock) fit in better.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-16 11:14:19 +03:00
Paul B Mahol
7543fd80e5 exr: check size of uncompressed buffer returned by uncompress()
The actual size of uncompressed buffer returned by uncompress() may be
smaller than expected, so abort decoding in such cases.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-16 00:39:37 +00:00
Michael Niedermayer
8b855b69a1 Changelog: add geotiff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 02:07:25 +02:00
Michael Niedermayer
fbe02459dc Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Check for CommandLineToArgvW
  vc1dec: Do not use random pred_flag if motion vector data is skipped
  vp8: Enclose pthread function calls in ifdefs
  snow: refactor code to work around a compiler bug in MSVC.
  vp8: Include the thread headers before using the pthread types
  configure: Check for getaddrinfo in ws2tcpip.h, too
  vp8: implement sliced threading
  vp8: move data from VP8Context->VP8Macroblock
  vp8: refactor decoding a single mb_row
  doc: update api changes with the right commit hashes
  mem: introduce av_malloc_array and av_mallocz_array

Conflicts:
	configure
	doc/APIchanges
	libavcodec/vp8.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16 01:32:52 +02:00
Martin Storsjö
03d1b18e96 configure: Remove an unused 'have' item
This is only used for checking for a certain library, but the code
doesn't need to know whether the function was found.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-16 01:58:35 +03:00
Diego Biurrun
20d569dd61 mpeg: remove disabled code 2012-07-16 00:15:21 +02:00
Mohammad Alsaleh
c37c383e59 libfdk-aac: Check if cutoff value is valid
Passing a cutoff value < sample_rate/256 will cause a crash.
Also, values >20000 will have no effect and 20000 will be used anyway.

Signed-off-by: Mohammad Alsaleh <msal@tormail.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 21:59:51 +03:00
Martin Storsjö
9e4b04f8b9 network: Always use our version of gai_strerror on windows
Even if linking directly to getaddrinfo, use our version of
gai_strerror instead of the system's version. Microsoft explicitly
documents that their version of gai_strerror is thread-unsafe.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 21:41:38 +03:00
Martin Storsjö
c98e2053f5 network: Undefine existing gai_strerror definitions
This avoids warnings if there already exists a definition.

This is the case on windows, where the getaddrinfo isn't available
and linked to (and we use our fallbacks instead, which actually
try to use the proper getaddrinfo version if found at runtime),
but gai_strerror still exists as a define.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 21:41:28 +03:00
Martin Storsjö
2ca6e9bb47 network: Extend the fallback gai_strerror implementation to handle more error codes
This is useful if a proper getaddrinfo is loaded dynamically on
windows, while using the fallback implementation of gai_strerror.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 21:21:59 +03:00
Stefano Sabatini
9a1963fbb8 ffprobe: reindent after the previous commit 2012-07-15 16:27:22 +02:00
Stefano Sabatini
5626e812d2 ffprobe: only decode frame if the codec is available
Fix crash when a stream codec is unknown, in particular fix trac
ticket #1243.
2012-07-15 15:57:11 +02:00
Stefano Sabatini
fda968aa8f lavfi: decrease logging level of message showing initial parameters
Reduce log clutter, consistent with 1a49a169eb.
2012-07-15 15:07:03 +02:00
Carl Eugen Hoyos
a1e52c9441 Simplify ptx decoding on big-endian.
Reviewed-by: Reimar Döffinger
2012-07-15 15:04:44 +02:00
Piotr Bandurski
a8ff7e3f96 riff: Assign U263 FourCC to CODEC_ID_H263 2012-07-15 14:55:05 +02:00
Piotr Bandurski
96e2507363 isom: add "NO16" FourCC
samples:

http://www.datafilehost.com/download-46d9a0fa.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 14:49:32 +02:00
Piotr Bandurski
198c4ea200 riff: add dvis/pdvc FourCCs
samples:

http://www.datafilehost.com/download-4b49270d.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 14:49:32 +02:00
Michael Niedermayer
209f92d94a lavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 14:49:32 +02:00
Piotr Bandurski
8d0ec6e060 isom: add "MNG" FourCC
sample:

http://www.datafilehost.com/download-92da395c.html

Reviewed-by:  compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 14:49:32 +02:00
Ronald S. Bultje
b4675d0fbf configure: Check for CommandLineToArgvW
The actual result of the check isn't used anywhere (since we
use this function unconditionally within #ifdef _WIN32), but it
makes sure we explicitly link to shell32 (which is linked in
implictly on mingw).

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 14:03:53 +03:00
Mashiat Sarker Shakkhar
082829520e vc1dec: Do not use random pred_flag if motion vector data is skipped
This fixes SA10143.vc1 from test-suite. Also partially fixes MC-VC1.ts
from videolan streams archive.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 14:02:38 +03:00
Martin Storsjö
25f056e6d4 vp8: Enclose pthread function calls in ifdefs
This fixes building with threads disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 13:55:18 +03:00
Paul B Mahol
2c31ed3330 exr: make channel_offsets int instead of int8_t
Prior to this change max number of channels for float data which was
going to be correctly decoded was 32, which is rather small
considering that exr allows multiple channel layers.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-15 02:53:51 +00:00
Paul B Mahol
1463bd902a cosmetics: reindent after d3abbb1d1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-15 02:31:40 +00:00
Paul B Mahol
a8f6df8a4f libfdk-aacenc: remove redundant log message if ff_alloc_packet2 fails
The whole point of ff_alloc_packet2 is to not bloat code with
duplicated error messages.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-15 02:19:48 +00:00
Ronald S. Bultje
c44091a9f7 snow: refactor code to work around a compiler bug in MSVC.
This fixes the compiler error "cannot convert from 'BlockNode' to
'int16_t'".
2012-07-14 19:19:34 -07:00
Martin Storsjö
a794600c00 vp8: Include the thread headers before using the pthread types
This was unnoticed on linux, since stdlib.h apparently includes
files declaring the pthread_mutex_t and pthread_cond_t types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-07-14 19:19:33 -07:00
Paul B Mahol
6ad4560031 mss1: improve check if decoded pivot is invalid
The pivot has to lie between 0 and base.
Check of ==base is insufficient.
Thus replace it by a proper check.

Fixes out of array write.

Fixes bug #1531.

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-15 02:12:02 +00:00
Michael Niedermayer
ab46300078 Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 03:40:19 +02:00
Michael Niedermayer
39afcf1d7e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  eval: add gt(), gte(), lt() and lte() fate tests
  eval: fix swapping of lt() and lte()
  imgconvert: deprecate avcodec_find_best_pix_fmt()
  imgconvert: add avcodec_find_best_pix_fmt2()
  imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt

Conflicts:
	libavcodec/imgconvert.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-15 01:23:16 +02:00
Ronald S. Bultje
39d18f21a5 configure: Check for getaddrinfo in ws2tcpip.h, too
This function is only available in the headers if unconditionally
targeting a version >= XP. It is not strictly necessary, since we
try loading these functions dynamically at runtime on windows in
the fallback, but this makes things a bit faster and more
straightforward.

On mingw32, this function isn't visible by default, while it is
on mingw64 (on both 32 and 64 bit).

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-15 02:19:34 +03:00
Philip Langdale
2c501ae82b movtextdec: 3GPP TS 26.245 Timed Text Decoder.
This change introduces a basic decoder for 3GPP Timed Text subtitles,
also known as TX3G, Quicktime subtitles, or "movtext" in the existing
code.

This initial change doesn't attempt to parse styling information,
and just reads the plain text of the subtitles. I intend to add
support for styles eventually, but it's challenging due to a lack
of existing players that support them.

Signed-off-by: Philip Langdale <philipl@overt.org>
2012-07-14 14:50:02 -07:00
Daniel Kang
951455c1c1 vp8: implement sliced threading
Testing gives 25-30% gain on HD clips with two threads and
up to 50% gain with eight threads.

Sliced threading uses more memory than single or frame threading.

Frame threading and single threading keep the previous memory
layout.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-14 20:18:54 +02:00
Daniel Kang
17343e3952 vp8: move data from VP8Context->VP8Macroblock
In preparation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-14 20:18:54 +02:00
Daniel Kang
337ade52de vp8: refactor decoding a single mb_row
This is in preperation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-14 20:18:54 +02:00
Luca Barbato
45ff9e5b57 doc: update api changes with the right commit hashes 2012-07-14 20:07:25 +02:00
Luca Barbato
f3e5e6f05b mem: introduce av_malloc_array and av_mallocz_array
Both function ease allocating large arrays implementing the overflow
check inside it.
2012-07-14 20:07:25 +02:00