OSDN Git Service

android-x86/external-ffmpeg.git
12 years agoconfigure: fix help message for --disable-avfilter
Stefano Sabatini [Sun, 15 Jul 2012 15:03:06 +0000 (17:03 +0200)]
configure: fix help message for --disable-avfilter

Increase consistency with the other similar messages.

12 years agolavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return...
Stefano Sabatini [Wed, 18 Jul 2012 13:41:20 +0000 (15:41 +0200)]
lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy

12 years agoffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines)
Michael Niedermayer [Wed, 18 Jul 2012 14:35:01 +0000 (16:35 +0200)]
ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines)

This commit caused Ticket1490 (Infinity loop / lock in export image)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomlpdec: switch to av_assert
Michael Niedermayer [Wed, 18 Jul 2012 14:19:51 +0000 (16:19 +0200)]
mlpdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws/input: switch to av_assert
Michael Niedermayer [Wed, 18 Jul 2012 14:18:32 +0000 (16:18 +0200)]
sws/input: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Jul 2012 23:27:19 +0000 (01:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavfiltergraph: document a catch in request_oldest().
Nicolas George [Tue, 17 Jul 2012 15:53:50 +0000 (17:53 +0200)]
avfiltergraph: document a catch in request_oldest().

This one is tricky. Consider a graph with two sink links, A and B.
request_oldest() requests on A, and A returns EOF. This EOF causes
a filter to flush pending frames to B; they are unrequested.
Then request_oldest() moves on to B, and B returns EOF.

12 years agoavfiltergraph: add a debug message on EOF.
Nicolas George [Tue, 17 Jul 2012 15:47:50 +0000 (17:47 +0200)]
avfiltergraph: add a debug message on EOF.

12 years agolavfi: rescale link->current_pts.
Nicolas George [Tue, 17 Jul 2012 15:43:39 +0000 (17:43 +0200)]
lavfi: rescale link->current_pts.

The doxy says, and the heap implementations assumes,
it is in AV_TIME_BASE units.

12 years agoptx: correct decoding
Paul B Mahol [Mon, 16 Jul 2012 21:53:44 +0000 (21:53 +0000)]
ptx: correct decoding

The image data is in BGR and not in RGB.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agomov/aac: skip initial aac padding
Michael Niedermayer [Sun, 15 Jul 2012 13:29:01 +0000 (15:29 +0200)]
mov/aac: skip initial aac padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoriff: add "SM4V" FourCC
Piotr Bandurski [Tue, 17 Jul 2012 13:34:26 +0000 (15:34 +0200)]
riff: add "SM4V" FourCC

Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavf:rmdec.c fill duration to AVFormatContext
William Yu [Fri, 13 Jul 2012 09:16:01 +0000 (17:16 +0800)]
avf:rmdec.c fill duration to AVFormatContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibopenjpeg: introduce encoding support
Michael Bradshaw [Thu, 17 Nov 2011 23:57:09 +0000 (16:57 -0700)]
libopenjpeg: introduce encoding support

Based on FFmpeg version from
commit 713a7854e06964abc8f7d015b94acbed27769d24

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agolibopenjpeg: rename decoder source file.
Michael Bradshaw [Thu, 17 Nov 2011 14:39:16 +0000 (15:39 +0100)]
libopenjpeg: rename decoder source file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agosws: handle non native rgb<->rgb convertions
Michael Niedermayer [Tue, 17 Jul 2012 02:24:24 +0000 (04:24 +0200)]
sws: handle non native rgb<->rgb convertions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoyuv2rgb: implement 15/16bit ordered dither
Michael Niedermayer [Tue, 17 Jul 2012 02:47:23 +0000 (04:47 +0200)]
yuv2rgb: implement 15/16bit ordered dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoRTMPTS protocol support
Samuel Pitoiset [Tue, 17 Jul 2012 10:02:43 +0000 (12:02 +0200)]
RTMPTS protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoRTMPS protocol support
Samuel Pitoiset [Tue, 17 Jul 2012 10:02:42 +0000 (12:02 +0200)]
RTMPS protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolswr: channel_map requires input conversion.
Nicolas George [Mon, 16 Jul 2012 12:18:19 +0000 (14:18 +0200)]
lswr: channel_map requires input conversion.

channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.

12 years agoavconv: print an error message when demuxing fails.
Anton Khirnov [Sun, 15 Jul 2012 22:22:05 +0000 (00:22 +0200)]
avconv: print an error message when demuxing fails.

Also exit in such a case if -xerror is used.

Fixes bug 329.

12 years agoFix libilbc compilation.
chinshou [Tue, 17 Jul 2012 06:53:36 +0000 (08:53 +0200)]
Fix libilbc compilation.

Fixes ticket #1540

12 years agompeg4videodec: Add two missing format specifiers for debug output.
Carl Eugen Hoyos [Tue, 17 Jul 2012 06:12:49 +0000 (08:12 +0200)]
mpeg4videodec: Add two missing format specifiers for debug output.

12 years agompeg4videodec: Use format specifier PRId64 for int64_t.
Carl Eugen Hoyos [Tue, 17 Jul 2012 06:11:31 +0000 (08:11 +0200)]
mpeg4videodec: Use format specifier PRId64 for int64_t.

12 years agoRemove internal MPlayer FourCC viv1.
Carl Eugen Hoyos [Tue, 17 Jul 2012 06:09:32 +0000 (08:09 +0200)]
Remove internal MPlayer FourCC viv1.

Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
12 years agotscc2: DCT output should not be clipped
Kostya Shishkov [Mon, 16 Jul 2012 18:14:37 +0000 (20:14 +0200)]
tscc2: DCT output should not be clipped

This fixes decoding some TSCC2 files with large quantisers.

12 years agosws: extend dither tables by 1 line so simpler arithmetic can be used to address...
Michael Niedermayer [Tue, 17 Jul 2012 02:45:55 +0000 (04:45 +0200)]
sws: extend dither tables by 1 line so simpler arithmetic can be used to address the next line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotiff: read more tags of type string
Paul B Mahol [Mon, 16 Jul 2012 00:55:18 +0000 (00:55 +0000)]
tiff: read more tags of type string

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agotiff: add smarter checks if there is enough data left
Paul B Mahol [Mon, 16 Jul 2012 00:31:11 +0000 (00:31 +0000)]
tiff: add smarter checks if there is enough data left

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agotiff: port to bytestream2
Paul B Mahol [Sun, 15 Jul 2012 20:58:13 +0000 (20:58 +0000)]
tiff: port to bytestream2

Prevents out of array reads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agortmp: Rename rtmphttp to ffrtmphttp
Samuel Pitoiset [Mon, 16 Jul 2012 09:56:20 +0000 (11:56 +0200)]
rtmp: Rename rtmphttp to ffrtmphttp

The prefix makes it easier to distinguish the proper end-user
protocols from the internal ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolavu: disable av_uninit for clang
Paul B Mahol [Mon, 16 Jul 2012 19:30:13 +0000 (19:30 +0000)]
lavu: disable av_uninit for clang

This silence bunch of useless warnings like:

libavformat/mpeg.c:393:37: warning: variable 'dvdaudio_substream_type' is uninitialized when used within its own initialization [-Wuninitialized]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 16 Jul 2012 18:45:35 +0000 (20:45 +0200)]
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>
12 years agoffmpeg: fix streamcopy of some mp3 in avi
Michael Niedermayer [Fri, 13 Jul 2012 14:24:54 +0000 (16:24 +0200)]
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>
12 years agoffv1dec: fix error concealment for gop>1
Michael Niedermayer [Mon, 16 Jul 2012 14:48:09 +0000 (16:48 +0200)]
ffv1dec: fix error concealment for gop>1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix DCA-XXCH extension scaling for embedded downmixes.
Nick Brereton [Sat, 14 Jul 2012 12:47:02 +0000 (13:47 +0100)]
Fix DCA-XXCH extension scaling for embedded downmixes.

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix ordering of XXCH downmix coefficients.
Nick Brereton [Thu, 12 Jul 2012 12:49:23 +0000 (13:49 +0100)]
Fix ordering of XXCH downmix coefficients.

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1dec: detect errors in bytestream end mismatches for EC
Michael Niedermayer [Mon, 16 Jul 2012 13:41:40 +0000 (15:41 +0200)]
ffv1dec: detect errors in bytestream end mismatches for EC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1dec: set the first slices bytestream end correctly
Michael Niedermayer [Mon, 16 Jul 2012 13:41:17 +0000 (15:41 +0200)]
ffv1dec: set the first slices bytestream end correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1dec: keep track of errors in slice headers for EC
Michael Niedermayer [Mon, 16 Jul 2012 13:40:39 +0000 (15:40 +0200)]
ffv1dec: keep track of errors in slice headers for EC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1dec: add simple error concealment in case of CRC errors on slices.
Michael Niedermayer [Mon, 16 Jul 2012 13:39:58 +0000 (15:39 +0200)]
ffv1dec: add simple error concealment in case of CRC errors on slices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffv1: keep last_frame (to be used for error concealment)
Michael Niedermayer [Mon, 16 Jul 2012 13:38:27 +0000 (15:38 +0200)]
ffv1: keep last_frame (to be used for error concealment)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoconfigure: print if the docs building tools have been found
Michael Niedermayer [Mon, 16 Jul 2012 12:45:41 +0000 (14:45 +0200)]
configure: print if the docs building tools have been found

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc/filters: Fix two typos
Tim Nicholson [Mon, 16 Jul 2012 07:36:06 +0000 (08:36 +0100)]
doc/filters: Fix two typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortmp: rtmp_parse_result() add case for video and audio packets to avoid undesired...
Jordi Ortiz [Tue, 3 Jul 2012 18:20:02 +0000 (18:20 +0000)]
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>
12 years agoconfigure: Move the getaddrinfo function check into the network block
Martin Storsjö [Sun, 15 Jul 2012 22:11:18 +0000 (01:11 +0300)]
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>
12 years agoexr: check size of uncompressed buffer returned by uncompress()
Paul B Mahol [Fri, 13 Jul 2012 02:02:10 +0000 (02:02 +0000)]
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>
12 years agoChangelog: add geotiff
Michael Niedermayer [Mon, 16 Jul 2012 00:07:25 +0000 (02:07 +0200)]
Changelog: add geotiff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 15 Jul 2012 23:32:52 +0000 (01:32 +0200)]
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>
12 years agoconfigure: Remove an unused 'have' item
Martin Storsjö [Sun, 15 Jul 2012 22:00:21 +0000 (01:00 +0300)]
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>
12 years agompeg: remove disabled code
Diego Biurrun [Fri, 29 Jul 2011 10:01:22 +0000 (12:01 +0200)]
mpeg: remove disabled code

12 years agolibfdk-aac: Check if cutoff value is valid
Mohammad Alsaleh [Sun, 15 Jul 2012 16:41:11 +0000 (19:41 +0300)]
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>
12 years agonetwork: Always use our version of gai_strerror on windows
Martin Storsjö [Mon, 25 Jun 2012 09:50:13 +0000 (12:50 +0300)]
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>
12 years agonetwork: Undefine existing gai_strerror definitions
Martin Storsjö [Mon, 18 Jun 2012 20:36:15 +0000 (23:36 +0300)]
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>
12 years agonetwork: Extend the fallback gai_strerror implementation to handle more error codes
Martin Storsjö [Mon, 25 Jun 2012 09:44:18 +0000 (12:44 +0300)]
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>
12 years agoffprobe: reindent after the previous commit
Stefano Sabatini [Sun, 15 Jul 2012 14:27:22 +0000 (16:27 +0200)]
ffprobe: reindent after the previous commit

12 years agoffprobe: only decode frame if the codec is available
Stefano Sabatini [Sun, 15 Jul 2012 13:56:02 +0000 (15:56 +0200)]
ffprobe: only decode frame if the codec is available

Fix crash when a stream codec is unknown, in particular fix trac
ticket #1243.

12 years agolavfi: decrease logging level of message showing initial parameters
Stefano Sabatini [Sat, 14 Jul 2012 16:26:04 +0000 (18:26 +0200)]
lavfi: decrease logging level of message showing initial parameters

Reduce log clutter, consistent with 1a49a169eb74a97.

12 years agoSimplify ptx decoding on big-endian.
Carl Eugen Hoyos [Sun, 15 Jul 2012 13:04:44 +0000 (15:04 +0200)]
Simplify ptx decoding on big-endian.

Reviewed-by: Reimar Döffinger
12 years agoriff: Assign U263 FourCC to CODEC_ID_H263
Piotr Bandurski [Sun, 15 Jul 2012 12:55:05 +0000 (14:55 +0200)]
riff: Assign U263 FourCC to CODEC_ID_H263

12 years agoisom: add "NO16" FourCC
Piotr Bandurski [Sun, 15 Jul 2012 11:25:47 +0000 (13:25 +0200)]
isom: add "NO16" FourCC

samples:

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoriff: add dvis/pdvc FourCCs
Piotr Bandurski [Sun, 15 Jul 2012 10:49:27 +0000 (12:49 +0200)]
riff: add dvis/pdvc FourCCs

samples:

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.
Michael Niedermayer [Sun, 15 Jul 2012 11:54:08 +0000 (13:54 +0200)]
lavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoisom: add "MNG" FourCC
Piotr Bandurski [Sat, 14 Jul 2012 16:42:29 +0000 (18:42 +0200)]
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>
12 years agoconfigure: Check for CommandLineToArgvW
Ronald S. Bultje [Mon, 25 Jun 2012 05:43:14 +0000 (08:43 +0300)]
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>
12 years agovc1dec: Do not use random pred_flag if motion vector data is skipped
Mashiat Sarker Shakkhar [Sun, 15 Jul 2012 01:37:10 +0000 (07:37 +0600)]
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>
12 years agovp8: Enclose pthread function calls in ifdefs
Martin Storsjö [Sat, 14 Jul 2012 21:11:35 +0000 (00:11 +0300)]
vp8: Enclose pthread function calls in ifdefs

This fixes building with threads disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoexr: make channel_offsets int instead of int8_t
Paul B Mahol [Sat, 14 Jul 2012 22:12:12 +0000 (22:12 +0000)]
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>
12 years agocosmetics: reindent after d3abbb1d1
Paul B Mahol [Sun, 15 Jul 2012 02:31:40 +0000 (02:31 +0000)]
cosmetics: reindent after d3abbb1d1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agolibfdk-aacenc: remove redundant log message if ff_alloc_packet2 fails
Paul B Mahol [Sun, 15 Jul 2012 02:19:48 +0000 (02:19 +0000)]
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>
12 years agosnow: refactor code to work around a compiler bug in MSVC.
Ronald S. Bultje [Sat, 7 Jul 2012 16:06:50 +0000 (09:06 -0700)]
snow: refactor code to work around a compiler bug in MSVC.

This fixes the compiler error "cannot convert from 'BlockNode' to
'int16_t'".

12 years agovp8: Include the thread headers before using the pthread types
Martin Storsjö [Sat, 14 Jul 2012 21:19:44 +0000 (00:19 +0300)]
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>
12 years agomss1: improve check if decoded pivot is invalid
Paul B Mahol [Sat, 14 Jul 2012 23:27:21 +0000 (23:27 +0000)]
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>
12 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Sun, 15 Jul 2012 01:40:12 +0000 (03:40 +0200)]
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>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Jul 2012 23:21:05 +0000 (01:21 +0200)]
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>
12 years agoconfigure: Check for getaddrinfo in ws2tcpip.h, too
Ronald S. Bultje [Sun, 24 Jun 2012 19:22:29 +0000 (22:22 +0300)]
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>
12 years agomovtextdec: 3GPP TS 26.245 Timed Text Decoder.
Philip Langdale [Sat, 23 Jun 2012 21:11:19 +0000 (14:11 -0700)]
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>
12 years agovp8: implement sliced threading
Daniel Kang [Thu, 12 Jul 2012 20:07:06 +0000 (13:07 -0700)]
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>
12 years agovp8: move data from VP8Context->VP8Macroblock
Daniel Kang [Wed, 11 Jul 2012 18:34:05 +0000 (11:34 -0700)]
vp8: move data from VP8Context->VP8Macroblock

In preparation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agovp8: refactor decoding a single mb_row
Daniel Kang [Wed, 11 Jul 2012 18:34:04 +0000 (11:34 -0700)]
vp8: refactor decoding a single mb_row

This is in preperation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agodoc: update api changes with the right commit hashes
Luca Barbato [Tue, 10 Jul 2012 23:45:26 +0000 (01:45 +0200)]
doc: update api changes with the right commit hashes

12 years agomem: introduce av_malloc_array and av_mallocz_array
Luca Barbato [Mon, 9 Jul 2012 13:29:30 +0000 (15:29 +0200)]
mem: introduce av_malloc_array and av_mallocz_array

Both function ease allocating large arrays implementing the overflow
check inside it.

12 years agomp3enc: add lame tag with start padding info
Michael Niedermayer [Wed, 4 Jul 2012 20:22:18 +0000 (22:22 +0200)]
mp3enc: add lame tag with start padding info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: add -progress option.
Nicolas George [Sun, 8 Jul 2012 11:03:39 +0000 (13:03 +0200)]
ffmpeg: add -progress option.

It allows to send program-friendly (easy to parse)
progress information to a file or an URL.

12 years agoeval: add gt(), gte(), lt() and lte() fate tests
Janne Grunau [Sat, 14 Jul 2012 11:31:14 +0000 (13:31 +0200)]
eval: add gt(), gte(), lt() and lte() fate tests

12 years agolibx264: list possible presets and tunes.
Nicolas George [Fri, 13 Jul 2012 22:34:50 +0000 (00:34 +0200)]
libx264: list possible presets and tunes.

The values are listed if setting them fails.
Using "-preset help" or "-preset list" have that effect.

12 years agoeval: fix swapping of lt() and lte()
Max Lazarov [Sat, 31 Mar 2012 06:56:56 +0000 (23:56 -0700)]
eval: fix swapping of lt() and lte()

CC: libav-stable@libav.org
12 years agolavc/tiffenc: apply misc doxy fixes
Stefano Sabatini [Tue, 10 Jul 2012 23:24:49 +0000 (01:24 +0200)]
lavc/tiffenc: apply misc doxy fixes

12 years agoffprobe: add frame metadata printing
Stefano Sabatini [Tue, 10 Jul 2012 22:43:53 +0000 (00:43 +0200)]
ffprobe: add frame metadata printing

12 years agolavc/tiff: add GeoTIFF support to the TIFF decoder
Thomas Kühnel [Mon, 3 Oct 2011 22:19:52 +0000 (00:19 +0200)]
lavc/tiff: add GeoTIFF support to the TIFF decoder

Work done for SOCIS 2011.

See thread:
Subject: [libav-devel] [PATCH 2/3] tiff: Add GeoTIFF support to the TIFF decoder
Date: Tue,  4 Oct 2011 00:19:52 +0200

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
12 years agolavc/avcodec.h: keep avframe_* field setter and getter close
Stefano Sabatini [Wed, 11 Jul 2012 23:32:24 +0000 (01:32 +0200)]
lavc/avcodec.h: keep avframe_* field setter and getter close

Slightly more readable, now that the list is getting longer.

12 years agolavc: add metadata to AVFrame
Thomas Kühnel [Mon, 26 Sep 2011 20:26:13 +0000 (22:26 +0200)]
lavc: add metadata to AVFrame

See thread:
Subject: [libav-devel] [PATCH 1/3] avcodec: add metadata to AVFrame
Date: Tue,  4 Oct 2011 00:19:51 +0200

12 years agoconfigure: Check that texi2html supports --init-file
jamal [Thu, 12 Jul 2012 07:07:59 +0000 (04:07 -0300)]
configure: Check that texi2html supports --init-file

Fixes ticket #1515

12 years agodoc/Makefile: Add missing $(HOSTEXESUF) to print_options
jamal [Thu, 12 Jul 2012 01:45:00 +0000 (22:45 -0300)]
doc/Makefile: Add missing $(HOSTEXESUF) to print_options

12 years agobuild: Fix documentation dependencies and rules
jamal [Thu, 12 Jul 2012 01:41:25 +0000 (22:41 -0300)]
build: Fix documentation dependencies and rules

12 years agodoc/filters: prefer "special" over "magic" for special input/output labels
Stefano Sabatini [Sat, 14 Jul 2012 09:10:24 +0000 (11:10 +0200)]
doc/filters: prefer "special" over "magic" for special input/output labels

12 years agodoc/filters: update documentation
Stefano Sabatini [Wed, 11 Jul 2012 15:47:24 +0000 (17:47 +0200)]
doc/filters: update documentation

In particular, assume existence of audio and sink filters.

12 years agodoc: merge libavfilter.texi into filters.texi
Stefano Sabatini [Wed, 11 Jul 2012 15:38:46 +0000 (17:38 +0200)]
doc: merge libavfilter.texi into filters.texi

There is no much point into splitting documentation for filters. Also
having a separate document for a library is inconsistent.

12 years agoffmpeg: use pkt_pts before pkt->pts for audio
Michael Niedermayer [Sat, 14 Jul 2012 02:24:40 +0000 (04:24 +0200)]
ffmpeg: use pkt_pts before pkt->pts for audio

This fixes the timestamp of the first packet when samples have been skiped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: set pkt_timebase
Michael Niedermayer [Sat, 14 Jul 2012 02:24:00 +0000 (04:24 +0200)]
ffmpeg: set pkt_timebase

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