ffmpeg.git
7 years agodoc/formats: remove probe_score entry, since it's not an option
Stefano Sabatini [Wed, 28 Aug 2013 22:08:27 +0000 (00:08 +0200)]
doc/formats: remove probe_score entry, since it's not an option

7 years agoavformat: export probe score
Michael Niedermayer [Thu, 8 Aug 2013 20:39:49 +0000 (22:39 +0200)]
avformat: export probe score

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: Fix memleak of the ratecontrol related memory
Michael Niedermayer [Wed, 28 Aug 2013 18:53:21 +0000 (20:53 +0200)]
snowenc: Fix memleak of the ratecontrol related memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/snow: check for malloc* failures
Michael Niedermayer [Wed, 28 Aug 2013 15:02:10 +0000 (17:02 +0200)]
avcodec/snow: check for malloc* failures

Also return and pass on error codes where needed for this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: check for memory allocation failures
Michael Niedermayer [Wed, 28 Aug 2013 14:52:30 +0000 (16:52 +0200)]
snowenc: check for memory allocation failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 28 Aug 2013 11:03:09 +0000 (13:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document the asf demuxer

Conflicts:
doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'
Michael Niedermayer [Wed, 28 Aug 2013 10:57:05 +0000 (12:57 +0200)]
Merge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'

* commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7':
  vf_interlace: fix file permissions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'
Michael Niedermayer [Wed, 28 Aug 2013 10:46:08 +0000 (12:46 +0200)]
Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

* commit 'ef51692a49d58963966adca55c62da9c34c3c7e1':
  Revert "w32pthread: help compiler figure out undeeded code"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1'
Michael Niedermayer [Wed, 28 Aug 2013 10:40:47 +0000 (12:40 +0200)]
Merge commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1'

* commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1':
  w32threads: Don't use function pointers when linking directly to newer APIs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'
Michael Niedermayer [Wed, 28 Aug 2013 10:34:29 +0000 (12:34 +0200)]
Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

* commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd':
  smoothstreamingenc: Write to a temp file while updating the manifest

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0'
Michael Niedermayer [Wed, 28 Aug 2013 10:28:21 +0000 (12:28 +0200)]
Merge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0'

* commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0':
  ac3: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '818d1f1a3e89d35213af0bd5dc4a772713951882'
Michael Niedermayer [Wed, 28 Aug 2013 10:15:54 +0000 (12:15 +0200)]
Merge commit '818d1f1a3e89d35213af0bd5dc4a772713951882'

* commit '818d1f1a3e89d35213af0bd5dc4a772713951882':
  ac3: Clean up the error paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6258d362b82934a2c27557e0984aed372d98091a'
Michael Niedermayer [Wed, 28 Aug 2013 10:09:20 +0000 (12:09 +0200)]
Merge commit '6258d362b82934a2c27557e0984aed372d98091a'

* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'
Michael Niedermayer [Wed, 28 Aug 2013 10:03:00 +0000 (12:03 +0200)]
Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

* commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2':
  flv: Fix the help string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
Michael Niedermayer [Wed, 28 Aug 2013 09:55:03 +0000 (11:55 +0200)]
Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'

* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
  doc: Document the flv demuxer

Conflicts:
doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'
Michael Niedermayer [Wed, 28 Aug 2013 09:32:02 +0000 (11:32 +0200)]
Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'

* commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca':
  matroskaenc: Fix writing TRACKDEFAULTFLAG

Conflicts:
libavformat/matroskaenc.c
tests/fate/wavpack.mak
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: document the asf demuxer
Luca Barbato [Tue, 27 Aug 2013 14:14:42 +0000 (16:14 +0200)]
doc: document the asf demuxer

And drop a typo from the previous FLV entry.

7 years agocmdutils: Filter non user AVOptions out from what can be set over the command line.
Michael Niedermayer [Tue, 27 Aug 2013 22:12:18 +0000 (00:12 +0200)]
cmdutils: Filter non user AVOptions out from what can be set over the command line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_interlace: fix file permissions
Vittorio Giovara [Tue, 27 Aug 2013 21:41:39 +0000 (23:41 +0200)]
vf_interlace: fix file permissions

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoRevert "w32pthread: help compiler figure out undeeded code"
Martin Storsjö [Tue, 27 Aug 2013 11:55:06 +0000 (14:55 +0300)]
Revert "w32pthread: help compiler figure out undeeded code"

This reverts commit 4622f11f9c83db8a2e08408c71ff901826ca652c.

The compiler should be able to do the dead code elimination now
without this when the cond_* names point directly to the real
functions instead of to local function pointers.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agow32threads: Don't use function pointers when linking directly to newer APIs
Martin Storsjö [Tue, 27 Aug 2013 11:48:56 +0000 (14:48 +0300)]
w32threads: Don't use function pointers when linking directly to newer APIs

This reduces the call overhead slightly. More noticeably, it
restores the earlier (unintended?) feature that condition variable
functions work just fine even if w32thread_init() hasn't been called.
This was broken as a side effect of 4622f11f9, if explicitly targeting
Vista+.

This makes w32threading work in VP8 again, if targeting Vista+.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosmoothstreamingenc: Write to a temp file while updating the manifest
Martin Storsjö [Sat, 17 Aug 2013 15:42:23 +0000 (16:42 +0100)]
smoothstreamingenc: Write to a temp file while updating the manifest

If a client tries to read the file while it's being updated, the client
would get an incomplete manifest. Instead write to a separate temp file
and atomically rename it to replace the previous one.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoac3: Return proper error codes
Luca Barbato [Sat, 27 Jul 2013 08:16:35 +0000 (10:16 +0200)]
ac3: Return proper error codes

7 years agoac3: Clean up the error paths
Luca Barbato [Sun, 28 Jul 2013 11:32:18 +0000 (13:32 +0200)]
ac3: Clean up the error paths

7 years agoac3: Do not clash with normal AVERROR
Luca Barbato [Sun, 28 Jul 2013 11:26:12 +0000 (13:26 +0200)]
ac3: Do not clash with normal AVERROR

The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values,
make sure they are not misunderstood.

7 years agoflv: Fix the help string
Luca Barbato [Tue, 27 Aug 2013 11:04:21 +0000 (13:04 +0200)]
flv: Fix the help string

7 years agodoc: Document the flv demuxer
Luca Barbato [Mon, 26 Aug 2013 14:22:44 +0000 (16:22 +0200)]
doc: Document the flv demuxer

7 years agolibavutil: cast truncated values to uint32_t
Alfred E. Heggestad [Mon, 26 Aug 2013 20:31:43 +0000 (22:31 +0200)]
libavutil: cast truncated values to uint32_t

programs using ffmpeg that are compiled with -Wshorten-64-to-32
gives a warning when using header files common.h and rational.h

cast 64-bit truncated values to (uint32_t) to avoid the warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskaenc: Fix writing TRACKDEFAULTFLAG
John Stebbins [Thu, 22 Aug 2013 15:54:59 +0000 (08:54 -0700)]
matroskaenc: Fix writing TRACKDEFAULTFLAG

The element was only being written when the value == 1.  But the default
value of this element is 1, so this has no useful effect.  This element
needs to be written when the value == 0.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Aug 2013 10:52:12 +0000 (12:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Check for errors from mov_create_chapter_track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'
Michael Niedermayer [Tue, 27 Aug 2013 10:47:04 +0000 (12:47 +0200)]
Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

* commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242':
  movenc: Properly free allocated data on failures in mov_write_header

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'
Michael Niedermayer [Tue, 27 Aug 2013 10:33:39 +0000 (12:33 +0200)]
Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'

* commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe':
  movenc: Check that tracks->enc exists before trying to free extradata

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4d122b01e4ce539269ee2df193b061772c7374f6'
Michael Niedermayer [Tue, 27 Aug 2013 10:26:19 +0000 (12:26 +0200)]
Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'

* commit '4d122b01e4ce539269ee2df193b061772c7374f6':
  movenc: Check for allocation failures in mov_create_chapter_track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Check for errors from mov_create_chapter_track
Martin Storsjö [Mon, 26 Aug 2013 07:45:27 +0000 (10:45 +0300)]
movenc: Check for errors from mov_create_chapter_track

On failures in the write_trailer function, we could also ignore
the errors and try to finish the file despite these errors (which
would only leave an incomplete chapters track). It's probably better
to signal the error clearly to the caller though (and if this
function failed there's no guarantee that there's enough memory to
finish the trailer either).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Properly free allocated data on failures in mov_write_header
Martin Storsjö [Mon, 26 Aug 2013 07:59:46 +0000 (10:59 +0300)]
movenc: Properly free allocated data on failures in mov_write_header

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Check that tracks->enc exists before trying to free extradata
Martin Storsjö [Mon, 26 Aug 2013 07:56:17 +0000 (10:56 +0300)]
movenc: Check that tracks->enc exists before trying to free extradata

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Check for allocation failures in mov_create_chapter_track
Martin Storsjö [Sun, 25 Aug 2013 18:23:58 +0000 (21:23 +0300)]
movenc: Check for allocation failures in mov_create_chapter_track

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavformat/ftp: make const tables static const
Michael Niedermayer [Sun, 4 Aug 2013 20:27:02 +0000 (22:27 +0200)]
avformat/ftp: make const tables static const

Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavpackenc: remove duplicate 'const' declaration specifier
Paul B Mahol [Mon, 26 Aug 2013 19:30:45 +0000 (19:30 +0000)]
wavpackenc: remove duplicate 'const' declaration specifier

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomsrledec: use memset()
Paul B Mahol [Mon, 26 Aug 2013 15:41:29 +0000 (15:41 +0000)]
msrledec: use memset()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomsrledec: use bytestream2_get_bufferu()
Paul B Mahol [Mon, 26 Aug 2013 15:37:13 +0000 (15:37 +0000)]
msrledec: use bytestream2_get_bufferu()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosgidec: use bytestream2_get_bufferu()
Paul B Mahol [Mon, 26 Aug 2013 15:17:01 +0000 (15:17 +0000)]
sgidec: use bytestream2_get_bufferu()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/fft-test: put ff_dct* code under CONFIG_DCT
Michael Niedermayer [Mon, 26 Aug 2013 18:39:22 +0000 (20:39 +0200)]
avcodec/fft-test: put ff_dct* code under CONFIG_DCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/fate/libavcodec: fate-idct8x8 needs dct
Michael Niedermayer [Mon, 26 Aug 2013 18:37:31 +0000 (20:37 +0200)]
tests/fate/libavcodec: fate-idct8x8 needs dct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/fate/fft: add mdct dependency as mdct is used too
Michael Niedermayer [Mon, 26 Aug 2013 18:36:35 +0000 (20:36 +0200)]
tests/fate/fft: add mdct dependency as mdct is used too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests/fate/cover-art: add file protocol & rawvideo muxer dependency
Michael Niedermayer [Mon, 26 Aug 2013 18:35:57 +0000 (20:35 +0200)]
tests/fate/cover-art: add file protocol & rawvideo muxer dependency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: dct_test needs CONFIG_DCT
Michael Niedermayer [Mon, 26 Aug 2013 18:19:01 +0000 (20:19 +0200)]
avcodec: dct_test needs CONFIG_DCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: Make ffv1.3 non experimental
Michael Niedermayer [Sat, 17 Aug 2013 02:28:53 +0000 (04:28 +0200)]
ffv1enc: Make ffv1.3 non experimental

The fate tests change as they used 1.2 previously
The increased size is due to:
32bit CRCs per slice by default (can be disabled),
it adds slice headers to allow decoding one slice without the others
an additional slice size field is added to make it possible to find
slices within corrupted surroundings.

these add up to about 57bit per slice more
at 50 frames and 4 slices thats 1425 byte

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_fps: Work around msvc (c99wrap) build failure
Pavel Koshevoy [Mon, 26 Aug 2013 13:23:02 +0000 (15:23 +0200)]
avfilter/vf_fps: Work around msvc (c99wrap) build failure

c99wrap choked on initialization of .dbl start_time option with
AV_NOPTS_VALUE: Unable to parse int64_t as expression primary

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Aug 2013 12:53:10 +0000 (14:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  imc: support mode 1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'
Michael Niedermayer [Mon, 26 Aug 2013 12:46:56 +0000 (14:46 +0200)]
Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'

* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
  twinvq: set block align for codecs and use it in size checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'
Michael Niedermayer [Mon, 26 Aug 2013 12:31:07 +0000 (14:31 +0200)]
Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'

* commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63':
  mov: Write tmcd extradata

This commit should make no difference as we had tmcd support
already, which is not changed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'
Michael Niedermayer [Mon, 26 Aug 2013 12:26:09 +0000 (14:26 +0200)]
Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'

* commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f':
  mov: Parse tmcd extradata

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'
Michael Niedermayer [Mon, 26 Aug 2013 11:57:01 +0000 (13:57 +0200)]
Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'

* commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d':
  mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'
Michael Niedermayer [Mon, 26 Aug 2013 11:28:04 +0000 (13:28 +0200)]
Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'

* commit '08504380ddf25d6905e189e9bf52e7a4c771a415':
  mov: Refactor codec specific final steps in mov_finalize_stsd_codec

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'
Michael Niedermayer [Mon, 26 Aug 2013 11:18:34 +0000 (13:18 +0200)]
Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'

* commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e':
  mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'
Michael Niedermayer [Mon, 26 Aug 2013 11:14:09 +0000 (13:14 +0200)]
Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'

* commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4':
  mov: Refactor audio specific parsing in mov_parse_stsd_audio

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'
Michael Niedermayer [Mon, 26 Aug 2013 11:04:39 +0000 (13:04 +0200)]
Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'

* commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e':
  mov: Refactor video specific parsing in mov_parse_stsd_video

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bf9856250584228678963ce8f11c54f85005d783'
Michael Niedermayer [Mon, 26 Aug 2013 10:44:29 +0000 (12:44 +0200)]
Merge commit 'bf9856250584228678963ce8f11c54f85005d783'

* commit 'bf9856250584228678963ce8f11c54f85005d783':
  mov: Refactor codec id selection in mov_codec_id

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimc: support mode 1
Kostya Shishkov [Thu, 11 Jul 2013 05:04:42 +0000 (07:04 +0200)]
imc: support mode 1

7 years agotwinvq: set block align for codecs and use it in size checks
Kostya Shishkov [Sat, 24 Aug 2013 13:00:08 +0000 (15:00 +0200)]
twinvq: set block align for codecs and use it in size checks

This both allows factoring out size check for both MetaSound and TwinVQ-VQF
decoders and fixes the situation when there are several MetaSound frames
stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).

7 years agoavformat/mp3dec: improve detection of mp3s with huge id3 tags
Michael Niedermayer [Sun, 25 Aug 2013 22:57:35 +0000 (00:57 +0200)]
avformat/mp3dec: improve detection of mp3s with huge id3 tags

When a id3 tag is larger than the amount of space we will probe
give it a score similar to what a .mp3 extension would have given it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: move PROBE_BUF_M* to internal.h
Michael Niedermayer [Sun, 25 Aug 2013 22:54:30 +0000 (00:54 +0200)]
avformat: move PROBE_BUF_M* to internal.h

They will be used by the mp3 probe function in the next commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/tcp: fix pointer to int warning
Michael Niedermayer [Sun, 25 Aug 2013 17:44:40 +0000 (19:44 +0200)]
avformat/tcp: fix pointer to int warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools/graph2dot: fix use of deprecated *put_count
Michael Niedermayer [Sun, 25 Aug 2013 17:37:37 +0000 (19:37 +0200)]
tools/graph2dot: fix use of deprecated *put_count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/graphparser: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:36:58 +0000 (19:36 +0200)]
avfilter/graphparser: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/graphdump: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:14:17 +0000 (19:14 +0200)]
avfilter/graphdump: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/filtfmts: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:14:17 +0000 (19:14 +0200)]
avfilter/filtfmts: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: Write tmcd extradata
Luca Barbato [Sun, 25 Aug 2013 11:02:33 +0000 (13:02 +0200)]
mov: Write tmcd extradata

7 years agomov: Parse tmcd extradata
Luca Barbato [Sun, 25 Aug 2013 11:02:07 +0000 (13:02 +0200)]
mov: Parse tmcd extradata

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Aug 2013 10:26:08 +0000 (12:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h264: Free rbsp_buffer before copying context over it
Michael Niedermayer [Sun, 25 Aug 2013 01:15:26 +0000 (03:15 +0200)]
avcodec/h264: Free rbsp_buffer before copying context over it

Fixes memleak
Fixes Ticket1900

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak
Michael Niedermayer [Sun, 25 Aug 2013 01:29:52 +0000 (03:29 +0200)]
avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: prevent rbsp_buffer values from becoming duplicated
Michael Niedermayer [Sun, 25 Aug 2013 01:01:19 +0000 (03:01 +0200)]
h264: prevent rbsp_buffer values from becoming duplicated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/movenc: move chapter_properties under the #if of the code that uses it
Michael Niedermayer [Sat, 24 Aug 2013 21:23:00 +0000 (23:23 +0200)]
avcodec/movenc: move chapter_properties under the #if of the code that uses it

Fixes warning about unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ituh263dec: detect and warn about RTP
Michael Niedermayer [Sat, 24 Aug 2013 21:06:59 +0000 (23:06 +0200)]
avcodec/ituh263dec: detect and warn about RTP

Fixes Ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: make next_nb_channels[] static const
Michael Niedermayer [Sat, 24 Aug 2013 12:27:16 +0000 (14:27 +0200)]
ffplay: make next_nb_channels[] static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h263dec: fix aspect of lead h263 EHC
Michael Niedermayer [Sat, 24 Aug 2013 16:44:24 +0000 (18:44 +0200)]
avcodec/h263dec: fix aspect of lead h263 EHC

Fixes part of ticket925

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
Luca Barbato [Thu, 22 Aug 2013 13:05:27 +0000 (15:05 +0200)]
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd

7 years agomov: Refactor codec specific final steps in mov_finalize_stsd_codec
Luca Barbato [Thu, 22 Aug 2013 13:05:27 +0000 (15:05 +0200)]
mov: Refactor codec specific final steps in mov_finalize_stsd_codec

7 years agomov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
Luca Barbato [Thu, 22 Aug 2013 13:05:27 +0000 (15:05 +0200)]
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle

7 years agomov: Refactor audio specific parsing in mov_parse_stsd_audio
Luca Barbato [Thu, 22 Aug 2013 13:05:27 +0000 (15:05 +0200)]
mov: Refactor audio specific parsing in mov_parse_stsd_audio

7 years agomov: Refactor video specific parsing in mov_parse_stsd_video
Luca Barbato [Thu, 22 Aug 2013 13:05:27 +0000 (15:05 +0200)]
mov: Refactor video specific parsing in mov_parse_stsd_video

7 years agomov: Refactor codec id selection in mov_codec_id
Luca Barbato [Thu, 22 Aug 2013 13:00:46 +0000 (15:00 +0200)]
mov: Refactor codec id selection in mov_codec_id

7 years agoh264_cabac: Mark functions calling decode_cabac_residual_internal as noinline
Diego Biurrun [Thu, 15 Aug 2013 22:29:23 +0000 (00:29 +0200)]
h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

This ensures that decode_cabac_residual_internal actually does get inlined,
which it otherwise does not, even though it is marked as always_inline.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 24 Aug 2013 09:30:23 +0000 (11:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
Michael Niedermayer [Sat, 24 Aug 2013 09:21:25 +0000 (11:21 +0200)]
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'

* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
  libfdk-aacdec: formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
Michael Niedermayer [Sat, 24 Aug 2013 09:03:51 +0000 (11:03 +0200)]
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'

* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
  vp56: Mark VP6-only optimizations as such.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h263dec: use FF_CEIL_RSHIFT()
Michael Niedermayer [Sat, 24 Aug 2013 02:09:43 +0000 (04:09 +0200)]
avcodec/h263dec: use FF_CEIL_RSHIFT()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: check log2_cblk dimensions
Michael Niedermayer [Sat, 24 Aug 2013 01:19:40 +0000 (03:19 +0200)]
jpeg2000: check log2_cblk dimensions

Fixes out of array access
Fixes Ticket2895

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotruemotion1: check av_fast_malloc() return value
Paul B Mahol [Fri, 23 Aug 2013 23:16:13 +0000 (23:16 +0000)]
truemotion1: check av_fast_malloc() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotruemotion1: use av_freep()
Paul B Mahol [Fri, 23 Aug 2013 23:12:42 +0000 (23:12 +0000)]
truemotion1: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agompeg4videodec: fix GEOV/GEOX fliping
Michael Niedermayer [Fri, 23 Aug 2013 22:56:26 +0000 (00:56 +0200)]
mpeg4videodec: fix GEOV/GEOX fliping

Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: change a bunch of assert() to av_assert()
Michael Niedermayer [Fri, 23 Aug 2013 20:31:27 +0000 (22:31 +0200)]
snowenc: change a bunch of assert() to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopngdec: do not release buffer on failure instead report full progress
Paul B Mahol [Fri, 23 Aug 2013 18:55:55 +0000 (18:55 +0000)]
pngdec: do not release buffer on failure instead report full progress

Should fix heap-use-after-free as reported by Address Sanitizer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMAINTAINERS: Add my GPG fingerprint
Alexander Strasser [Tue, 26 Jun 2012 21:05:55 +0000 (23:05 +0200)]
MAINTAINERS: Add my GPG fingerprint

7 years agoavformat/redspark: check coef_off
Michael Niedermayer [Fri, 23 Aug 2013 17:12:54 +0000 (19:12 +0200)]
avformat/redspark: check coef_off

Fixes out of array reads

Found-by: Laurent Butti <laurentb@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: fix null pointer dereference in case of malloc failure
Michael Niedermayer [Fri, 23 Aug 2013 15:50:12 +0000 (17:50 +0200)]
jpeg2000: fix null pointer dereference in case of malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: zero reslevel array on allocation
Michael Niedermayer [Fri, 23 Aug 2013 16:05:53 +0000 (18:05 +0200)]
jpeg2000: zero reslevel array on allocation

prevent use of uninitialized values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: fix dereferencing invalid pointers
Michael Niedermayer [Fri, 23 Aug 2013 15:18:21 +0000 (17:18 +0200)]
jpeg2000: fix dereferencing invalid pointers

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>