ffmpeg.git
7 years agoavcodec/smacker: remove check that has become redundant
Michael Niedermayer [Thu, 12 Sep 2013 13:41:59 +0000 (15:41 +0200)]
avcodec/smacker: remove check that has become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/smacker: use the correct field instead of a hardcoded value for the index...
Michael Niedermayer [Thu, 12 Sep 2013 13:31:12 +0000 (15:31 +0200)]
avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovformat/smacker: use av_freep() to ensure no stale pointers remain
Michael Niedermayer [Thu, 12 Sep 2013 13:27:17 +0000 (15:27 +0200)]
vformat/smacker: use av_freep() to ensure no stale pointers remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: various cosmetics
Paul B Mahol [Sat, 7 Sep 2013 12:13:50 +0000 (12:13 +0000)]
avfilter: various cosmetics

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 12 Sep 2013 13:12:52 +0000 (15:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:
libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: move sections from lavc to lavu
Stefano Sabatini [Thu, 12 Sep 2013 07:20:05 +0000 (09:20 +0200)]
MAINTAINERS: move sections from lavc to lavu

Reflect current code organization.

7 years agoMerge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'
Michael Niedermayer [Thu, 12 Sep 2013 13:02:23 +0000 (15:02 +0200)]
Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'

* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'
Michael Niedermayer [Thu, 12 Sep 2013 12:57:08 +0000 (14:57 +0200)]
Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'

* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984':
  configure: Mention that icl does not build both static and shared libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b1e469885362febce3d9a4678624e44a92f77da9'
Michael Niedermayer [Thu, 12 Sep 2013 12:39:42 +0000 (14:39 +0200)]
Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'

* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c194464f51de87534d15602f99bf9759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
Michael Niedermayer [Thu, 12 Sep 2013 12:33:25 +0000 (14:33 +0200)]
Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'

* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
libavcodec/aic.c

See: 657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'
Michael Niedermayer [Thu, 12 Sep 2013 12:21:54 +0000 (14:21 +0200)]
Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'

* commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0':
  mpc8: Make sure the first stream exists before parsing the seek table

Conflicts:
libavformat/mpc8.c

See: 69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'
Michael Niedermayer [Thu, 12 Sep 2013 12:10:17 +0000 (14:10 +0200)]
Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'

* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
libavformat/mpc8.c

See: b61ba262a1e275f8129b7383d70fe48051b47fcf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0d61f260010707f3028b818e8b24598e1a83d696'
Michael Niedermayer [Thu, 12 Sep 2013 11:58:01 +0000 (13:58 +0200)]
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'

* commit '0d61f260010707f3028b818e8b24598e1a83d696':
  zmbvdec: Check the buffer size for uncompressed data

Conflicts:
libavcodec/zmbv.c

See: 44c23aa1b85d195db6647d24e3b1d3de051790db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '183b9d843a9533774fabd3984a52f3987001acbc'
Michael Niedermayer [Thu, 12 Sep 2013 11:45:03 +0000 (13:45 +0200)]
Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'

* commit '183b9d843a9533774fabd3984a52f3987001acbc':
  ape: Don't allow the seektable to be omitted

See: e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'
Michael Niedermayer [Thu, 12 Sep 2013 11:37:20 +0000 (13:37 +0200)]
Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'

* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc':
  shorten: Break out of loop looking for fmt chunk if none is found

See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'
Michael Niedermayer [Thu, 12 Sep 2013 11:30:44 +0000 (13:30 +0200)]
Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'

* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
libavcodec/shorten.c

See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskaenc: Fix stray pointers left over from av_reallocp_array refactoring
Alexandra Khirnova [Thu, 12 Sep 2013 07:49:38 +0000 (09:49 +0200)]
matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agomp3: add .mpa extension
Vittorio Giovara [Mon, 9 Sep 2013 14:30:35 +0000 (16:30 +0200)]
mp3: add .mpa extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoconfigure: Mention that icl does not build both static and shared libs
Diego Biurrun [Tue, 10 Sep 2013 10:28:19 +0000 (12:28 +0200)]
configure: Mention that icl does not build both static and shared libs

7 years agoMerge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
Michael Niedermayer [Thu, 12 Sep 2013 10:57:58 +0000 (12:57 +0200)]
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'

* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
Michael Niedermayer [Thu, 12 Sep 2013 10:45:29 +0000 (12:45 +0200)]
Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'

* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
libavcodec/smacker.c

See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4
the added test is redundant but will be used after future refactoring

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd002fce24a7206e95f9492031f45adc35711e183'
Michael Niedermayer [Thu, 12 Sep 2013 09:55:08 +0000 (11:55 +0200)]
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

* commit 'd002fce24a7206e95f9492031f45adc35711e183':
  smacker: Check malloc return values

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '710b0e27025948b7511821c2f888ff2d74a59e14'
Michael Niedermayer [Thu, 12 Sep 2013 09:38:55 +0000 (11:38 +0200)]
Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'

* commit '710b0e27025948b7511821c2f888ff2d74a59e14':
  smacker: Avoid integer overflow when allocating packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8d928023f953a28692ba27071a448259134b103b'
Michael Niedermayer [Thu, 12 Sep 2013 09:26:11 +0000 (11:26 +0200)]
Merge commit '8d928023f953a28692ba27071a448259134b103b'

* commit '8d928023f953a28692ba27071a448259134b103b':
  smacker: Don't return packets in unallocated streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'
Michael Niedermayer [Thu, 12 Sep 2013 09:17:21 +0000 (11:17 +0200)]
Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'

* commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e':
  dsicin: Add some basic sanity checks for fields read from the file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'
Michael Niedermayer [Thu, 12 Sep 2013 09:09:04 +0000 (11:09 +0200)]
Merge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'

* commit '5045f6bdfabfa5d3374756d2c23f762fb042acae':
  configure: Fix wrong reference to user support mailing list

Conflicts:
configure

No change as the reference was not wrong in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog2meet: Allocate cursor buffers large enough to fit the aligned width
Martin Storsjö [Wed, 11 Sep 2013 20:40:12 +0000 (23:40 +0300)]
g2meet: Allocate cursor buffers large enough to fit the aligned width

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaic: Validate values read from the bitstream
Martin Storsjö [Wed, 11 Sep 2013 20:25:04 +0000 (23:25 +0300)]
aic: Validate values read from the bitstream

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompc8: Make sure the first stream exists before parsing the seek table
Martin Storsjö [Wed, 11 Sep 2013 19:53:15 +0000 (22:53 +0300)]
mpc8: Make sure the first stream exists before parsing the seek table

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompc8: Check the seek table size parsed from the bitstream
Martin Storsjö [Wed, 11 Sep 2013 19:47:06 +0000 (22:47 +0300)]
mpc8: Check the seek table size parsed from the bitstream

Limit the size to INT_MAX/2 (for simplicity) to be sure that
size + FF_INPUT_BUFFER_PADDING_SIZE won't overflow.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agozmbvdec: Check the buffer size for uncompressed data
Michael Niedermayer [Sun, 11 Nov 2012 17:08:39 +0000 (18:08 +0100)]
zmbvdec: Check the buffer size for uncompressed data

Also don't pointlessly set the buffer size to 1 after copying
one packet.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoape: Don't allow the seektable to be omitted
Martin Storsjö [Wed, 11 Sep 2013 19:29:33 +0000 (22:29 +0300)]
ape: Don't allow the seektable to be omitted

The seektable is required for filling in ape->frames[i].pos
further down.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoshorten: Break out of loop looking for fmt chunk if none is found
Martin Storsjö [Wed, 11 Sep 2013 19:19:28 +0000 (22:19 +0300)]
shorten: Break out of loop looking for fmt chunk if none is found

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoshorten: Use a checked bytestream reader for the wave header
Martin Storsjö [Wed, 11 Sep 2013 19:17:13 +0000 (22:17 +0300)]
shorten: Use a checked bytestream reader for the wave header

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavu/sha512: Fully unroll the transform function loops
James Almer [Mon, 9 Sep 2013 23:16:40 +0000 (20:16 -0300)]
lavu/sha512: Fully unroll the transform function loops

crypto_bench SHA-512 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64

Before:
lavu       SHA-512      size: 1048576  runs:   1024  time:   12.737 +- 0.147

After:
lavu       SHA-512      size: 1048576  runs:   1024  time:   11.670 +- 0.173

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/sha: Fully unroll the transform function loops
James Almer [Mon, 9 Sep 2013 23:16:39 +0000 (20:16 -0300)]
lavu/sha: Fully unroll the transform function loops

crypto_bench SHA-1 and SHA-256 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64

Before:
lavu       SHA-1        size: 1048576  runs:   1024  time:    9.012 +- 0.162
lavu       SHA-256      size: 1048576  runs:   1024  time:   19.625 +- 0.173

After:
lavu       SHA-1        size: 1048576  runs:   1024  time:    7.948 +- 0.154
lavu       SHA-256      size: 1048576  runs:   1024  time:   17.841 +- 0.170

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: Free memory properly if the init function fails
Martin Storsjö [Wed, 11 Sep 2013 12:55:18 +0000 (15:55 +0300)]
smacker: Free memory properly if the init function fails

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosmacker: Make sure we don't fill in huffman codes out of range
Martin Storsjö [Wed, 11 Sep 2013 12:54:20 +0000 (15:54 +0300)]
smacker: Make sure we don't fill in huffman codes out of range

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosmacker: Check malloc return values
Martin Storsjö [Wed, 11 Sep 2013 12:35:19 +0000 (15:35 +0300)]
smacker: Check malloc return values

Also try to free local allocations on errors.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosmacker: Avoid integer overflow when allocating packets
Martin Storsjö [Wed, 11 Sep 2013 12:25:13 +0000 (15:25 +0300)]
smacker: Avoid integer overflow when allocating packets

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosmacker: Don't return packets in unallocated streams
Martin Storsjö [Wed, 11 Sep 2013 12:20:01 +0000 (15:20 +0300)]
smacker: Don't return packets in unallocated streams

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodsicin: Add some basic sanity checks for fields read from the file
Martin Storsjö [Wed, 11 Sep 2013 12:13:48 +0000 (15:13 +0300)]
dsicin: Add some basic sanity checks for fields read from the file

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavfilter: remove redundant use of AV_NE() macro
Paul B Mahol [Wed, 11 Sep 2013 13:29:12 +0000 (13:29 +0000)]
avfilter: remove redundant use of AV_NE() macro

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/nutdec: check for allocation failures
Paul B Mahol [Wed, 11 Sep 2013 11:30:15 +0000 (11:30 +0000)]
avformat/nutdec: check for allocation failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/vf_traspose: move switch out of loop
Paul B Mahol [Wed, 11 Sep 2013 14:56:46 +0000 (14:56 +0000)]
avfilter/vf_traspose: move switch out of loop

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec: add const qualifier to avcodec_find_best_pix_fmt2 args
Dylan Alex Simon [Tue, 13 Aug 2013 15:33:51 +0000 (11:33 -0400)]
avcodec: add const qualifier to avcodec_find_best_pix_fmt2 args

avcodec_find_best_pix_fmt2 does not modify its first argument so may be
marked const.  This avoids a warning when passing in AVCodec.pix_fmts.

Signed-off-by: Dylan Simon <dylan@dylex.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Fix wrong reference to user support mailing list
Diego Biurrun [Tue, 10 Sep 2013 10:42:10 +0000 (12:42 +0200)]
configure: Fix wrong reference to user support mailing list

7 years agoavformat/utils: use av_realloc_array()
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/utils: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mxfdec: use av_realloc_array()
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/mxfdec: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskaenc: use av_realloc_array()
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/matroskaenc: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskadec: use av_realloc_array()
Michael Niedermayer [Wed, 11 Sep 2013 11:34:25 +0000 (13:34 +0200)]
avformat/matroskadec: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskaenc: use av_freep() to avoid leaving stale pointers
Michael Niedermayer [Wed, 11 Sep 2013 11:19:51 +0000 (13:19 +0200)]
avformat/matroskaenc: use av_freep() to avoid leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/asfenc: use av_freep() for extra saftey
Michael Niedermayer [Wed, 11 Sep 2013 11:18:17 +0000 (13:18 +0200)]
avformat/asfenc: use av_freep() for extra saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/gxfenc: Clear nb_fields on array deallocation
Michael Niedermayer [Wed, 11 Sep 2013 11:16:03 +0000 (13:16 +0200)]
avformat/gxfenc: Clear nb_fields on array deallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/gxfenc: Check and propagate return code from gxf_write_map_packet()
Michael Niedermayer [Wed, 11 Sep 2013 11:14:12 +0000 (13:14 +0200)]
avformat/gxfenc: Check and propagate return code from gxf_write_map_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/smacker: check avformat_new_stream() return value
Paul B Mahol [Wed, 11 Sep 2013 10:23:03 +0000 (10:23 +0000)]
avformat/smacker: check avformat_new_stream() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/libnut: check avformat_new_stream() return value
Paul B Mahol [Wed, 11 Sep 2013 10:14:01 +0000 (10:14 +0000)]
avformat/libnut: check avformat_new_stream() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/ffmetadec: return meaningful error codes
Paul B Mahol [Wed, 11 Sep 2013 10:10:55 +0000 (10:10 +0000)]
avformat/ffmetadec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/sierravmd: check for memory allocation failures
Paul B Mahol [Wed, 11 Sep 2013 09:59:40 +0000 (09:59 +0000)]
avformat/sierravmd: check for memory allocation failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat/flic: check for memory allocation failures
Paul B Mahol [Tue, 10 Sep 2013 19:57:54 +0000 (19:57 +0000)]
avformat/flic: check for memory allocation failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Sep 2013 10:50:55 +0000 (12:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
Michael Niedermayer [Wed, 11 Sep 2013 10:41:35 +0000 (12:41 +0200)]
Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'

* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
  doc: Drop VDPAU from list of supported codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc'
Michael Niedermayer [Wed, 11 Sep 2013 10:31:43 +0000 (12:31 +0200)]
Merge commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc'

* commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc':
  fate.sh: Run git-clone quietly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: functions that add entries should not destroy the whole list on failure
Michael Niedermayer [Wed, 11 Sep 2013 10:13:44 +0000 (12:13 +0200)]
avformat/utils: functions that add entries should not destroy the whole list on failure

The caller does not expect this, and in case of adding new streams would then
not even be able to deallocate them anymore.

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mxfdec: functions that add entries should not destroy the whole list on...
Michael Niedermayer [Wed, 11 Sep 2013 10:13:44 +0000 (12:13 +0200)]
avformat/mxfdec: functions that add entries should not destroy the whole list on failure

The caller does not expect this and there are variables left that index to otherwise
deallocated data.

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskaenc: functions that add entries should not destroy the whole list...
Michael Niedermayer [Wed, 11 Sep 2013 10:13:44 +0000 (12:13 +0200)]
avformat/matroskaenc: functions that add entries should not destroy the whole list on failure

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskadec: ebml_parse_elem() should not deallocate priorly existing lists...
Michael Niedermayer [Wed, 11 Sep 2013 10:13:44 +0000 (12:13 +0200)]
avformat/matroskadec: ebml_parse_elem() should not deallocate priorly existing lists on failure

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'
Michael Niedermayer [Wed, 11 Sep 2013 08:54:41 +0000 (10:54 +0200)]
Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'

* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
  avformat: Use av_reallocp_array() where suitable

Conflicts:
libavformat/asfenc.c
libavformat/gxfenc.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mjpegdec: Support >8bpc color mjpeg
Michael Niedermayer [Wed, 11 Sep 2013 00:29:13 +0000 (02:29 +0200)]
avcodec/mjpegdec: Support >8bpc color mjpeg

Fixes Ticket2939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2()
Michael Niedermayer [Wed, 11 Sep 2013 00:44:34 +0000 (02:44 +0200)]
avcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavcodec: Adding support for End Trimming in Opus encoder
Vignesh Venkatasubramanian [Fri, 30 Aug 2013 18:26:53 +0000 (11:26 -0700)]
lavcodec: Adding support for End Trimming in Opus encoder

Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoopus/matroska: Adding support for End Trimming in demuxer/decoder
Vignesh Venkatasubramanian [Tue, 10 Sep 2013 18:12:21 +0000 (11:12 -0700)]
opus/matroska: Adding support for End Trimming in demuxer/decoder

Implementing support for end trimming Opus in Matroska by making
use of the DiscardPadding value from the container and discarding
the samples accordingly.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: Add support for discarding samples from the end
Vignesh Venkatasubramanian [Tue, 10 Sep 2013 19:07:43 +0000 (12:07 -0700)]
lavc/utils: Add support for discarding samples from the end

Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.

Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_psnr: >8 bit planar support
Paul B Mahol [Sun, 8 Sep 2013 11:37:07 +0000 (11:37 +0000)]
avfilter/vf_psnr: >8 bit planar support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc: Rename avtools-common-opts to fftools-common opts
Timothy Gu [Sun, 8 Sep 2013 22:36:55 +0000 (15:36 -0700)]
doc: Rename avtools-common-opts to fftools-common opts

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vp56: use av_reallocp_array() and check if allocation failed
Paul B Mahol [Mon, 9 Sep 2013 14:48:37 +0000 (14:48 +0000)]
avcodec/vp56: use av_reallocp_array() and check if allocation failed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffmpeg: check for unsupported "queing of command on first filter supporting the speci...
Michael Niedermayer [Tue, 10 Sep 2013 12:13:44 +0000 (14:13 +0200)]
ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: improve built in docs for passing commands
Michael Niedermayer [Tue, 10 Sep 2013 12:13:18 +0000 (14:13 +0200)]
ffmpeg: improve built in docs for passing commands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: print command replies starting on column 0
Michael Niedermayer [Tue, 10 Sep 2013 11:57:29 +0000 (13:57 +0200)]
ffmpeg: print command replies starting on column 0

This fixes formating issues with multi-line replies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/avfilter: fix null pointer dereference with queued ping filters
Michael Niedermayer [Tue, 10 Sep 2013 11:39:57 +0000 (13:39 +0200)]
avfilter/avfilter: fix null pointer dereference with queued ping filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMake avcodec_find_best_pix_fmt_of_list const-correct
Michael Bradshaw [Tue, 10 Sep 2013 04:32:03 +0000 (22:32 -0600)]
Make avcodec_find_best_pix_fmt_of_list const-correct

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/riff: add 0x594a TwoCC
Piotr Bandurski [Tue, 10 Sep 2013 00:21:19 +0000 (02:21 +0200)]
avformat/riff: add 0x594a TwoCC

sample:

http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDrop pointless directory name prefixes from #includes in the current dir
Diego Biurrun [Tue, 10 Sep 2013 06:30:54 +0000 (08:30 +0200)]
Drop pointless directory name prefixes from #includes in the current dir

7 years agodoc: Drop VDPAU from list of supported codecs
Diego Biurrun [Tue, 10 Sep 2013 06:30:42 +0000 (08:30 +0200)]
doc: Drop VDPAU from list of supported codecs

7 years agofate.sh: Run git-clone quietly
Diego Biurrun [Tue, 10 Sep 2013 06:26:27 +0000 (08:26 +0200)]
fate.sh: Run git-clone quietly

7 years agoavformat: Use av_reallocp_array() where suitable
Alexandra Khirnova [Tue, 10 Sep 2013 09:57:35 +0000 (11:57 +0200)]
avformat: Use av_reallocp_array() where suitable

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 10 Sep 2013 08:20:11 +0000 (10:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8b524ab0c43c1767919530abb79d3656113cdc47'
Michael Niedermayer [Tue, 10 Sep 2013 08:08:38 +0000 (10:08 +0200)]
Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
  movenc: Add a warning message if conflicting options have been specified

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'
Michael Niedermayer [Tue, 10 Sep 2013 07:52:51 +0000 (09:52 +0200)]
Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'

* commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1':
  tcp: Explicitly convert a pointer to a boolean integer

Conflicts:
libavformat/tcp.c

See: 22fbc7f8becdee1fd6ab7cac93ae23d6022e9a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 10 Sep 2013 00:05:04 +0000 (02:05 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Use 0x88 as stream id when muxing DTS in program streams.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoUse 0x88 as stream id when muxing DTS in program streams.
Carl Eugen Hoyos [Mon, 9 Sep 2013 23:48:59 +0000 (01:48 +0200)]
Use 0x88 as stream id when muxing DTS in program streams.

This is what other open source software uses and what
some hardware players expect.
Tested by trac user iuqbgq9h-1 at yahoo

7 years agolavf/matroska: Adding support for Opus CodecDelay
Vignesh Venkatasubramanian [Fri, 30 Aug 2013 17:52:36 +0000 (10:52 -0700)]
lavf/matroska: Adding support for Opus CodecDelay

In order to represent the codec delay accurately in Matroska, a
new element CodecDelay has been introduced. It contains the
overall delay added by the codec in nanoseconds. This patch adds
support for muxing CodecDelay value in the container.
Matroska spec for CodecDelay element can be found here:
http://matroska.org/technical/specs/index.html#CodecDelay

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoopus/matroska: Adding support for DiscardPadding in muxer
Vignesh Venkatasubramanian [Fri, 30 Aug 2013 18:26:37 +0000 (11:26 -0700)]
opus/matroska: Adding support for DiscardPadding in muxer

Support for end trimming Opus in Matroska is implemented by using
the DiscardPadding container element in the Block data. The last
chunk is stored as a Block instead of SimpleBlock and the
trimming information is stored and used to discard samples that
were padded by the Opus codec. This patch adds support for muxing
DiscardPadding element into the container with appropriate value.
Matroska spec for the DiscardPadding element can be found here:
http://matroska.org/technical/specs/index.html#DiscardPadding

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Simplify setting the fragmentation flag
Martin Storsjö [Mon, 9 Sep 2013 11:35:09 +0000 (14:35 +0300)]
movenc: Simplify setting the fragmentation flag

This makes sure the faststart vs fragmentation check works as
intended when fragmentation is enabled due to using the ismv mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add a warning message if conflicting options have been specified
Martin Storsjö [Mon, 9 Sep 2013 11:13:55 +0000 (14:13 +0300)]
movenc: Add a warning message if conflicting options have been specified

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotcp: Explicitly convert a pointer to a boolean integer
Martin Storsjö [Mon, 9 Sep 2013 08:28:14 +0000 (11:28 +0300)]
tcp: Explicitly convert a pointer to a boolean integer

This fixes warnings about making integers from pointers without
a cast, and avoids the theoretical case where the lower 32 bits of
the pointer would all be zero where the implicit cast wouldn't give
the right result.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support
Paul B Mahol [Mon, 9 Sep 2013 10:28:20 +0000 (10:28 +0000)]
avcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/ffv1dec: fix format detection
Paul B Mahol [Mon, 9 Sep 2013 10:44:27 +0000 (10:44 +0000)]
avcodec/ffv1dec: fix format detection

Fixes crash with carefuly designed files.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMove packed B-frames message level to info.
Reimar Döffinger [Sun, 8 Sep 2013 17:49:01 +0000 (19:49 +0200)]
Move packed B-frames message level to info.

Since they generally decode fine, printing it as a warning
might not really be appropriate.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMake packed B-frame warning message more useful.
Reimar Döffinger [Sun, 8 Sep 2013 17:34:20 +0000 (19:34 +0200)]
Make packed B-frame warning message more useful.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>