ffmpeg.git
6 years agoMerge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'
Michael Niedermayer [Wed, 12 Mar 2014 01:45:34 +0000 (02:45 +0100)]
Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'

* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'
Michael Niedermayer [Wed, 12 Mar 2014 01:39:46 +0000 (02:39 +0100)]
Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'
Michael Niedermayer [Wed, 12 Mar 2014 01:33:27 +0000 (02:33 +0100)]
Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'

* commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c':
  http: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '390acbea0697a60300f249602dbf701e04274693'
Michael Niedermayer [Wed, 12 Mar 2014 01:22:16 +0000 (02:22 +0100)]
Merge commit '390acbea0697a60300f249602dbf701e04274693'

* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
Michael Niedermayer [Wed, 12 Mar 2014 01:04:41 +0000 (02:04 +0100)]
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'

* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
  avformat: Report the duration analysis reached

Conflicts:
libavformat/utils.c

See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/flvdec: discard inconsistent timestamps
Michael Niedermayer [Wed, 12 Mar 2014 00:50:41 +0000 (01:50 +0100)]
avformat/flvdec: discard inconsistent timestamps

Fixes Ticket3425

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: display information on stream cycling
Michael Niedermayer [Tue, 11 Mar 2014 00:20:18 +0000 (01:20 +0100)]
ffplay: display information on stream cycling

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: K&R formatting cosmetics
Luca Barbato [Mon, 10 Mar 2014 17:02:09 +0000 (18:02 +0100)]
http: K&R formatting cosmetics

6 years agohttp: Drop doxy comments
Luca Barbato [Mon, 10 Mar 2014 16:53:51 +0000 (17:53 +0100)]
http: Drop doxy comments

6 years agohttp: Return meaningful error codes
Luca Barbato [Mon, 10 Mar 2014 16:17:25 +0000 (17:17 +0100)]
http: Return meaningful error codes

6 years agoconfigure: Provide --pkg-config-flags
Luca Barbato [Mon, 20 Jan 2014 10:17:45 +0000 (11:17 +0100)]
configure: Provide --pkg-config-flags

Should be used only to pass extra flags to pkgconf invocation,
e.g. --static.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavformat: Report the duration analysis reached
Luca Barbato [Tue, 11 Mar 2014 12:41:18 +0000 (13:41 +0100)]
avformat: Report the duration analysis reached

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Mar 2014 20:19:46 +0000 (21:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add section about AviSynth support

Conflicts:
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
Michael Niedermayer [Tue, 11 Mar 2014 20:12:42 +0000 (21:12 +0100)]
Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'

* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
  configure: Document --pkg-config option

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
Michael Niedermayer [Tue, 11 Mar 2014 20:05:34 +0000 (21:05 +0100)]
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
  lavf: more correct printf format specifiers

Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vorbisdec: use the stored previous window type only when the actual previous...
Michael Niedermayer [Tue, 11 Mar 2014 19:45:29 +0000 (20:45 +0100)]
avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known

Fixes Ticket3432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Add section about AviSynth support
Stephen Hutchinson [Tue, 14 Jan 2014 14:49:29 +0000 (09:49 -0500)]
doc: Add section about AviSynth support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconfigure: Document --pkg-config option
Luca Barbato [Tue, 11 Mar 2014 18:12:05 +0000 (19:12 +0100)]
configure: Document --pkg-config option

6 years agoavformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()
Michael Niedermayer [Tue, 11 Mar 2014 18:18:23 +0000 (19:18 +0100)]
avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()

Fixes Ticket3421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: calculate missing bitrates from index
Michael Niedermayer [Tue, 11 Mar 2014 18:04:45 +0000 (19:04 +0100)]
avidec: calculate missing bitrates from index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 11 Mar 2014 12:57:52 +0000 (13:57 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Decode png images without iend chunk.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDocumented av_dump_format
Anshul Maheshwari [Tue, 11 Mar 2014 06:26:28 +0000 (11:56 +0530)]
Documented av_dump_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix modplug linkage on Windows.
Matt Oliver [Tue, 11 Mar 2014 03:20:44 +0000 (14:20 +1100)]
Fix modplug linkage on Windows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: more correct printf format specifiers
Diego Biurrun [Mon, 10 Mar 2014 14:35:59 +0000 (15:35 +0100)]
lavf: more correct printf format specifiers

6 years agoDecode png images without iend chunk.
Carl Eugen Hoyos [Tue, 11 Mar 2014 08:56:38 +0000 (09:56 +0100)]
Decode png images without iend chunk.

Fixes ticket #3357.

6 years agoavcodec/mjpegdec: support adob transform 2
Michael Niedermayer [Tue, 11 Mar 2014 03:20:23 +0000 (04:20 +0100)]
avcodec/mjpegdec: support adob transform 2

Fixes Ticket3426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: make it possible to disable xlib dependancy
Michael Niedermayer [Wed, 19 Feb 2014 02:59:32 +0000 (03:59 +0100)]
configure: make it possible to disable xlib dependancy

The unconditional dependancy was added in 7671dd7cd7d51bbd637cc46d8f104a141bc355ea

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fill in dates
Michael Niedermayer [Fri, 7 Mar 2014 01:59:10 +0000 (02:59 +0100)]
doc/APIchanges: fill in dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 10 Mar 2014 23:53:20 +0000 (00:53 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'
Michael Niedermayer [Mon, 10 Mar 2014 22:54:55 +0000 (23:54 +0100)]
Merge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'

* commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7':
  lavf: always use av_free

See: 88c8e4afeaf74ee58b67145e0331e229d8050968
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: miscellaneous cosmetics
Diego Biurrun [Sat, 2 Nov 2013 16:21:49 +0000 (17:21 +0100)]
configure: miscellaneous cosmetics

Sort lists of components. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.

6 years agoMerge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
Michael Niedermayer [Mon, 10 Mar 2014 22:38:01 +0000 (23:38 +0100)]
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'

* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
libavformat/hevc.c
libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a8562394b685e83ae4a38a93eef43625755a231'
Michael Niedermayer [Mon, 10 Mar 2014 22:00:55 +0000 (23:00 +0100)]
Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'

* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'
Michael Niedermayer [Mon, 10 Mar 2014 21:51:38 +0000 (22:51 +0100)]
Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'

* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5eacbb53289570834f9a1acb15fd406ea224eef6'
Michael Niedermayer [Mon, 10 Mar 2014 21:32:35 +0000 (22:32 +0100)]
Merge commit '5eacbb53289570834f9a1acb15fd406ea224eef6'

* commit '5eacbb53289570834f9a1acb15fd406ea224eef6':
  golomb: Add a get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: always use av_free
Michael Niedermayer [Mon, 10 Mar 2014 15:03:14 +0000 (15:03 +0000)]
lavf: always use av_free

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
6 years agolavf: simplify ff_hevc_annexb2mp4_buf
Tim Walker [Mon, 10 Mar 2014 15:03:13 +0000 (15:03 +0000)]
lavf: simplify ff_hevc_annexb2mp4_buf

Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

6 years agoDefine ff_log2_run[] in libavcodec/internal.h.
Carl Eugen Hoyos [Mon, 10 Mar 2014 12:37:12 +0000 (13:37 +0100)]
Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.

6 years agoReplace an incorrect av_free() in movenc.c with av_freep().
Carl Eugen Hoyos [Mon, 10 Mar 2014 12:30:51 +0000 (13:30 +0100)]
Replace an incorrect av_free() in movenc.c with av_freep().

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Mar 2014 11:03:29 +0000 (12:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Work around broken floating point limits on some systems.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'
Michael Niedermayer [Mon, 10 Mar 2014 10:51:40 +0000 (11:51 +0100)]
Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'

* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf':
  mxfdec: Validate parameters to strftime

Conflicts:
libavformat/mxfdec.c

See: 423089e964410adbf13af3de42e3c9dd5a1babd6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Use the right pkgconf file for openjpeg
Luca Barbato [Mon, 10 Mar 2014 10:48:04 +0000 (11:48 +0100)]
configure: Use the right pkgconf file for openjpeg

The current release of version 1 uses libopenjpeg1.

6 years agohevc: Use get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:59:48 +0000 (10:59 +0100)]
hevc: Use get_se_golomb_long

Do not use inline functions that refer to tables present in other
libraries.

6 years agogolomb: Add a get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:57:51 +0000 (10:57 +0100)]
golomb: Add a get_se_golomb_long

Useful in libavformat mostly.

6 years agoWork around broken floating point limits on some systems.
Anton Khirnov [Thu, 14 Nov 2013 11:19:04 +0000 (12:19 +0100)]
Work around broken floating point limits on some systems.

The values of {FLT,DBL}_{MAX,MIN} macros on some systems (older musl
libc, some BSD flavours) are not exactly representable, i.e.
(double)DBL_MAX == DBL_MAX is false
This violates (at least some interpretations of) the C99 standard and
breaks code (e.g. in vf_fps) like
double f = DBL_MAX;
[...]
if (f == DBL_MAX) { // f has not been changed yet
    [....]
}

6 years agomxfdec: Validate parameters to strftime
Martin Storsjö [Sun, 9 Mar 2014 20:44:10 +0000 (22:44 +0200)]
mxfdec: Validate parameters to strftime

The MSVCRT version of strftime calls the invalid parameter handler
if the struct values in struct tm are invalid. In case no invalid
parameter handler is set for the process, the process is aborted.

This fixes fate failures on MSVC builds since 570af382.

Based on a patch by Hendrik Leppkes.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoAdd fieldmatch test
Timothy Gu [Mon, 10 Mar 2014 01:16:29 +0000 (18:16 -0700)]
Add fieldmatch test

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Mar 2014 22:40:59 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a823d0948683bd97dd58556b5740e434166209a8'
Michael Niedermayer [Sun, 9 Mar 2014 22:34:09 +0000 (23:34 +0100)]
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'

* commit 'a823d0948683bd97dd58556b5740e434166209a8':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/hevc: fix mix of av_malloc() with free()
Michael Niedermayer [Sun, 9 Mar 2014 22:27:31 +0000 (23:27 +0100)]
avformat/hevc: fix mix of av_malloc() with free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'
Michael Niedermayer [Sun, 9 Mar 2014 22:13:19 +0000 (23:13 +0100)]
Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'

* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/hevc: Make return codes consistent and more flexible
Michael Niedermayer [Sun, 9 Mar 2014 22:12:45 +0000 (23:12 +0100)]
avformat/hevc: Make return codes consistent and more flexible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'
Michael Niedermayer [Sun, 9 Mar 2014 22:07:48 +0000 (23:07 +0100)]
Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'

* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: fix hevcs use of golomb from avformat
Michael Niedermayer [Sun, 9 Mar 2014 21:59:46 +0000 (22:59 +0100)]
avformat: fix hevcs use of golomb from avformat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'
Michael Niedermayer [Sun, 9 Mar 2014 21:48:08 +0000 (22:48 +0100)]
Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'

* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
  movenc: write hvcC tag for HEVC.

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'
Michael Niedermayer [Sun, 9 Mar 2014 21:31:16 +0000 (22:31 +0100)]
Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'

* commit '1d9014f0b008485eac4c19d5f5e11ede59237167':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'
Michael Niedermayer [Sun, 9 Mar 2014 21:30:04 +0000 (22:30 +0100)]
Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'

* commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919':
  riff: add VP9 fourcc

See: eb7f7b797f0ae76a7cf6db7792365998ee6e9cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
Michael Niedermayer [Sun, 9 Mar 2014 21:28:59 +0000 (22:28 +0100)]
Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'

* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def898e7499cf36b65b5debc4f303e7e5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9e71cc81f3655cacf0f91860fba3043f13b64059'
Michael Niedermayer [Sun, 9 Mar 2014 21:26:39 +0000 (22:26 +0100)]
Merge commit '9e71cc81f3655cacf0f91860fba3043f13b64059'

* commit '9e71cc81f3655cacf0f91860fba3043f13b64059':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
Michael Niedermayer [Sun, 9 Mar 2014 21:25:17 +0000 (22:25 +0100)]
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'

* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
libavformat/isom.c

See: e26b066cd8db361feba90e943c6cfdf062c52272
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '360022bd3b894cc01ea112b275fa4c8f53881808'
Michael Niedermayer [Sun, 9 Mar 2014 21:23:32 +0000 (22:23 +0100)]
Merge commit '360022bd3b894cc01ea112b275fa4c8f53881808'

* commit '360022bd3b894cc01ea112b275fa4c8f53881808':
  isom: lpcm in mov default to big endian

See: 8b3964ecd1bfc7ac65ae91013b404beb7d2c875a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'db32f14c3dfd75290b57a086183d6577457beac4'
Michael Niedermayer [Sun, 9 Mar 2014 21:22:05 +0000 (22:22 +0100)]
Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'

* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
  isom: add "MNG" FourCC

See: 8d0ec6e060b23c8ef188d759f59ee1e536c494ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'
Michael Niedermayer [Sun, 9 Mar 2014 21:20:33 +0000 (22:20 +0100)]
Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'

* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
  isom: Support MPEG-2 video mov files from FPC5

See: 0aded6bf028ff188e3bbd7eb023bd854b474b794
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'
Michael Niedermayer [Sun, 9 Mar 2014 21:15:32 +0000 (22:15 +0100)]
Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'

* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
libavformat/isom.c

See: 96e25073637f1fdc4818e193e74c38570c390d70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6509012398435252979e149ea4a73438d2107600'
Michael Niedermayer [Sun, 9 Mar 2014 21:13:11 +0000 (22:13 +0100)]
Merge commit '6509012398435252979e149ea4a73438d2107600'

* commit '6509012398435252979e149ea4a73438d2107600':
  isom: add Radius DV YUV FourCCs

See: a489db6cde48ed03c370a2f71b1be1e3485bc5db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: remove duplicated line
Michael Niedermayer [Sun, 9 Mar 2014 21:12:37 +0000 (22:12 +0100)]
avformat/isom: remove duplicated line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'eeae858596a5ce5a84797283f590a16add5704f4'
Michael Niedermayer [Sun, 9 Mar 2014 21:07:28 +0000 (22:07 +0100)]
Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
  isom: Support Sony XAVC in mov

See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'
Michael Niedermayer [Sun, 9 Mar 2014 21:06:08 +0000 (22:06 +0100)]
Merge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'

* commit 'c09804684a47e6572ee82ded5d84c8b282815da6':
  isom: add xd51 hdcam

See: 4110828e15cd5035a0893c31fb417a52736956ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'
Michael Niedermayer [Sun, 9 Mar 2014 20:44:40 +0000 (21:44 +0100)]
Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'

* commit '4d33873c2990b8d6096f60fef384f0efc4482b55':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c

See: d1e6602665d5ec1b7e211ab27b298c26139f82cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
Michael Niedermayer [Sun, 9 Mar 2014 20:15:55 +0000 (21:15 +0100)]
Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'

* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
libavcodec/hevc.c

See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6cc94e971933cd38c452172bb048bf760e65cc3e'
Michael Niedermayer [Sun, 9 Mar 2014 20:12:48 +0000 (21:12 +0100)]
Merge commit '6cc94e971933cd38c452172bb048bf760e65cc3e'

* commit '6cc94e971933cd38c452172bb048bf760e65cc3e':
  hevc: use av_mallocz() for allocating tab_ipm

See: 0999f1613bc48ed9d6578a3ad7bcd17610e07fbf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '920c01adce6c273fc043513ff237a6266e612152'
Michael Niedermayer [Sun, 9 Mar 2014 19:55:51 +0000 (20:55 +0100)]
Merge commit '920c01adce6c273fc043513ff237a6266e612152'

* commit '920c01adce6c273fc043513ff237a6266e612152':
  hevc: Use get_bits_long() in decode_vui()

See: b818637b84948e917d11c987f2270cea5b3fcfea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Tim Walker [Mon, 3 Mar 2014 14:53:45 +0000 (14:53 +0000)]
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

6 years agomatroskaenc: write private data in hvcC format for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:44 +0000 (14:53 +0000)]
matroskaenc: write private data in hvcC format for HEVC.

6 years agomovenc: allow muxing HEVC in MODE_MP4.
Tim Walker [Mon, 3 Mar 2014 14:53:43 +0000 (14:53 +0000)]
movenc: allow muxing HEVC in MODE_MP4.

6 years agomovenc: enable Annex B to MP4 conversion for HEVC tracks.
Tim Walker [Mon, 3 Mar 2014 14:53:42 +0000 (14:53 +0000)]
movenc: enable Annex B to MP4 conversion for HEVC tracks.

6 years agomovenc: write hvcC tag for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:41 +0000 (14:53 +0000)]
movenc: write hvcC tag for HEVC.

6 years agomovenc: use 'hev1' tag for HEVC in MODE_MOV.
Tim Walker [Mon, 3 Mar 2014 14:53:40 +0000 (14:53 +0000)]
movenc: use 'hev1' tag for HEVC in MODE_MOV.

'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.

6 years agoriff: add VP9 fourcc
James Zern [Sat, 9 Nov 2013 04:16:17 +0000 (20:16 -0800)]
riff: add VP9 fourcc

6 years agoriff: IPJ2 decodes with JPEG2000 decoder
Ben Littler [Thu, 23 Feb 2012 04:34:45 +0000 (23:34 -0500)]
riff: IPJ2 decodes with JPEG2000 decoder

Samples can be made from mencoder and jp2avi.dll codec.

6 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

6 years agolibspeex: support ZygoAudio (quality 10 mode)
Piotr Bandurski [Wed, 16 Jan 2013 18:32:54 +0000 (19:32 +0100)]
libspeex: support ZygoAudio (quality 10 mode)

6 years agoisom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
6 years agoisom: add "MNG" FourCC
Piotr Bandurski [Sat, 14 Jul 2012 16:42:29 +0000 (18:42 +0200)]
isom: add "MNG" FourCC

6 years agoisom: Support MPEG-2 video mov files from FPC5
Carl Eugen Hoyos [Sat, 22 Feb 2014 23:31:50 +0000 (00:31 +0100)]
isom: Support MPEG-2 video mov files from FPC5

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

6 years agoisom: add Radius DV YUV FourCCs
Piotr Bandurski [Tue, 5 Jun 2012 10:13:39 +0000 (12:13 +0200)]
isom: add Radius DV YUV FourCCs

6 years agoisom: Support Sony XAVC in mov
Carl Eugen Hoyos [Fri, 18 Oct 2013 05:50:50 +0000 (07:50 +0200)]
isom: Support Sony XAVC in mov

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoisom: add xd51 hdcam
Ben Littler [Wed, 19 Jun 2013 14:43:48 +0000 (10:43 -0400)]
isom: add xd51 hdcam

Someone needs to binary search FCP for new isom...

6 years agohevc: make pps/sps ids unsigned where necessary
Vittorio Giovara [Sun, 9 Mar 2014 16:15:26 +0000 (17:15 +0100)]
hevc: make pps/sps ids unsigned where necessary

Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
6 years agohevc: Do not turn 32bit timebases into negative numbers
Michael Niedermayer [Sat, 15 Feb 2014 22:09:55 +0000 (23:09 +0100)]
hevc: Do not turn 32bit timebases into negative numbers

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
6 years agohevc: use av_mallocz() for allocating tab_ipm
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
hevc: use av_mallocz() for allocating tab_ipm

Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Mar 2014 14:23:37 +0000 (15:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: fix errors in documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078
Michael Niedermayer [Sun, 9 Mar 2014 14:14:33 +0000 (15:14 +0100)]
avutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c708b5403346255ea5adc776645616cc7c61f078'
Michael Niedermayer [Sun, 9 Mar 2014 13:30:24 +0000 (14:30 +0100)]
Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

* commit 'c708b5403346255ea5adc776645616cc7c61f078':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '634d9d8b398982647b3d7160641198744901d8d8'
Michael Niedermayer [Sun, 9 Mar 2014 12:37:14 +0000 (13:37 +0100)]
Merge commit '634d9d8b398982647b3d7160641198744901d8d8'

* commit '634d9d8b398982647b3d7160641198744901d8d8':
  arm: get_cabac inline asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'
Michael Niedermayer [Sun, 9 Mar 2014 12:26:50 +0000 (13:26 +0100)]
Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'

* commit 'dfe224f377be3e45758c69d881ca7874b82d647a':
  aarch64: get_cabac inline asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'
Michael Niedermayer [Sun, 9 Mar 2014 12:02:27 +0000 (13:02 +0100)]
Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'

* commit '4506a854a4d846692ba71daeeff661dc214c8fa2':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: Use get_bits_long() in decode_vui()
Michael Niedermayer [Sat, 15 Feb 2014 21:29:17 +0000 (22:29 +0100)]
hevc: Use get_bits_long() in decode_vui()

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind