ffmpeg.git
6 years agoMerge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'
Michael Niedermayer [Thu, 29 Aug 2013 12:59:58 +0000 (14:59 +0200)]
Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'

* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'
Michael Niedermayer [Thu, 29 Aug 2013 12:53:39 +0000 (14:53 +0200)]
Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'

* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cd529172377229f2e86987869ccc08f426bfe114'
Michael Niedermayer [Thu, 29 Aug 2013 12:48:42 +0000 (14:48 +0200)]
Merge commit 'cd529172377229f2e86987869ccc08f426bfe114'

* commit 'cd529172377229f2e86987869ccc08f426bfe114':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a519583991c38d38503ab08357716513facc5725'
Michael Niedermayer [Thu, 29 Aug 2013 12:38:51 +0000 (14:38 +0200)]
Merge commit 'a519583991c38d38503ab08357716513facc5725'

* commit 'a519583991c38d38503ab08357716513facc5725':
  swscale: x86: Hide arch-specific initialization details

Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
Michael Niedermayer [Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)]
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'
Michael Niedermayer [Thu, 29 Aug 2013 12:23:28 +0000 (14:23 +0200)]
Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'
Michael Niedermayer [Thu, 29 Aug 2013 12:14:32 +0000 (14:14 +0200)]
Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'

* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
  avutil: Refactor CPU extension availability macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'
Michael Niedermayer [Thu, 29 Aug 2013 12:04:29 +0000 (14:04 +0200)]
Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
  avutil: Move internal CPU detection function declarations to private header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
Michael Niedermayer [Thu, 29 Aug 2013 12:01:28 +0000 (14:01 +0200)]
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'

* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '84146963d23d76b09af633e97413cd97d9b3021e'
Michael Niedermayer [Thu, 29 Aug 2013 11:52:05 +0000 (13:52 +0200)]
Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
Michael Niedermayer [Thu, 29 Aug 2013 11:42:41 +0000 (13:42 +0200)]
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'

* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
  rtmpproto: Fix limelight authentication with abbreviated app names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime
Michael Niedermayer [Thu, 29 Aug 2013 10:59:16 +0000 (12:59 +0200)]
avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'
Michael Niedermayer [Thu, 29 Aug 2013 11:02:28 +0000 (13:02 +0200)]
Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'

* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93':
  vf_fps: use double constants for default/min/max for start_time

Conflicts:
libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: check return value of av_malloc(z)
Paul B Mahol [Wed, 28 Aug 2013 16:48:15 +0000 (16:48 +0000)]
truemotion2: check return value of av_malloc(z)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/ftp: fix possible crash
Lukasz Marek [Wed, 28 Aug 2013 23:54:04 +0000 (01:54 +0200)]
lavf/ftp: fix possible crash

6 years agoavformat/utils: fix av_probe_input_buffer2() so it returns the probe score
Michael Niedermayer [Wed, 28 Aug 2013 23:07:57 +0000 (01:07 +0200)]
avformat/utils: fix av_probe_input_buffer2() so it returns the probe score

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: add missing entry for av_format_probe_score() function addition
Stefano Sabatini [Wed, 28 Aug 2013 22:10:34 +0000 (00:10 +0200)]
doc/APIchanges: add missing entry for av_format_probe_score() function addition

6 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

6 years agoppc: fdct: Remove vim editor settings comment
Diego Biurrun [Fri, 23 Aug 2013 16:46:49 +0000 (18:46 +0200)]
ppc: fdct: Remove vim editor settings comment

6 years agompegvideo: Replace arch initialization ifdeffery by standard conditionals
Diego Biurrun [Tue, 20 Aug 2013 16:25:04 +0000 (18:25 +0200)]
mpegvideo: Replace arch initialization ifdeffery by standard conditionals

6 years agox86: rv40dsp: Move inline assembly optimizations out of YASM init section
Diego Biurrun [Tue, 20 Aug 2013 13:26:02 +0000 (15:26 +0200)]
x86: rv40dsp: Move inline assembly optimizations out of YASM init section

6 years agoswscale: x86: Hide arch-specific initialization details
Diego Biurrun [Fri, 12 Oct 2012 17:54:45 +0000 (19:54 +0200)]
swscale: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

6 years agodsputil: x86: Hide arch-specific initialization details
Diego Biurrun [Fri, 12 Oct 2012 17:57:25 +0000 (19:57 +0200)]
dsputil: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

6 years agoppc: Add and use convenience macro to check for AltiVec availability
Diego Biurrun [Tue, 20 Aug 2013 14:36:47 +0000 (16:36 +0200)]
ppc: Add and use convenience macro to check for AltiVec availability

6 years agoavutil: Refactor CPU extension availability macros
Diego Biurrun [Tue, 20 Aug 2013 14:36:46 +0000 (16:36 +0200)]
avutil: Refactor CPU extension availability macros

6 years agoavutil: Move internal CPU detection function declarations to private header
Diego Biurrun [Tue, 20 Aug 2013 15:49:01 +0000 (17:49 +0200)]
avutil: Move internal CPU detection function declarations to private header

6 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>
6 years agoapedec: do not buffer decoded samples over AVPackets
Rafaël Carré [Tue, 27 Aug 2013 15:35:49 +0000 (17:35 +0200)]
apedec: do not buffer decoded samples over AVPackets

Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 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>
6 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>
6 years agoconfigure: x86: Fix handling of i686 and cpunop features
Diego Biurrun [Tue, 27 Aug 2013 21:33:57 +0000 (23:33 +0200)]
configure: x86: Fix handling of i686 and cpunop features

The i686 feature really is a CPU feature and should be handled as such.
The cpunop dependency on i686 should be expressed with a standard _deps
declaration instead of a manual test.

6 years agortmpproto: Fix limelight authentication with abbreviated app names
Martin Storsjö [Thu, 15 Aug 2013 10:17:15 +0000 (13:17 +0300)]
rtmpproto: Fix limelight authentication with abbreviated app names

When streaming to limelight, the app name is either a full
"appname/subaccount" or "appname/_definst_". In the latter case,
the app name can be simplified into simply "appname", but the
authentication hashing assumes the /_definst_ still to be present.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovf_fps: use double constants for default/min/max for start_time
Hendrik Leppkes [Tue, 27 Aug 2013 20:44:14 +0000 (22:44 +0200)]
vf_fps: use double constants for default/min/max for start_time

When using AV_NOPTS_VALUE (which expands to INT64_C(0x8000000000000000))
as union initializer for a double field, the c99 converter needs to
interpret this constant when filling the union initializer, and it is
interpreted as a positive value.

When converting AV_NOPTS_VALUE to a double, MSVC 2010 ends up with
the same positive value as the c99 converter, while MSVC 2012 gets
a negative value.

This results in an infite loop in various FATE tests on MSVC 2012.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoac3: Return proper error codes
Luca Barbato [Sat, 27 Jul 2013 08:16:35 +0000 (10:16 +0200)]
ac3: Return proper error codes

6 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

6 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.

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

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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoimc: support mode 1
Kostya Shishkov [Thu, 11 Jul 2013 05:04:42 +0000 (07:04 +0200)]
imc: support mode 1

6 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).

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agomov: Write tmcd extradata
Luca Barbato [Sun, 25 Aug 2013 11:02:33 +0000 (13:02 +0200)]
mov: Write tmcd extradata

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

6 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>