ffmpeg.git
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

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

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

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

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

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

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

5 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)

5 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>
5 years agoisom: add "MNG" FourCC
Piotr Bandurski [Sat, 14 Jul 2012 16:42:29 +0000 (18:42 +0200)]
isom: add "MNG" FourCC

5 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

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

5 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

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

5 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
5 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
5 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
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 9 Mar 2014 01:54:34 +0000 (02:54 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: split dvb packet to slices
  libzvbi-teletextdec: use av_dlog where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Mar 2014 01:05:03 +0000 (02:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Use pkg-config for openjpeg

Conflicts:
configure

Not merged / merge just for metadata at request of carl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'
Michael Niedermayer [Sun, 9 Mar 2014 00:50:11 +0000 (01:50 +0100)]
Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'

* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'
Michael Niedermayer [Sun, 9 Mar 2014 00:41:55 +0000 (01:41 +0100)]
Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
  matroskaenc: allow override of "writing application" tag

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'
Michael Niedermayer [Sun, 9 Mar 2014 00:14:57 +0000 (01:14 +0100)]
Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'

* commit '61985ad72c47bbb668f2d3923bf5c9df83e79323':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'
Michael Niedermayer [Sun, 9 Mar 2014 00:05:37 +0000 (01:05 +0100)]
Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'

* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
  rv10: K&R formatting cosmetics

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'
Michael Niedermayer [Sat, 8 Mar 2014 23:57:22 +0000 (00:57 +0100)]
Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'

* commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13':
  rv10: Forward error from rv10_decode_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofloat_dsp: fix errors in documentation
Janne Grunau [Sun, 2 Mar 2014 19:33:49 +0000 (20:33 +0100)]
float_dsp: fix errors in documentation

5 years agotimer: use mach_absolute_time as high resolution clock on darwin
Janne Grunau [Fri, 24 Jan 2014 00:15:31 +0000 (01:15 +0100)]
timer: use mach_absolute_time as high resolution clock on darwin

Not guaranteed to be in nanosecond resolution. On iOS 7 the duration
of one tick is 125/3 ns which is still more than an order of magnitude
better then microseconds.

Replace decicycles with the neutral UNITS. Decicycles is strange but
tenths of a nanosecond and unspecific "deci"-ticks for mach_absolute_time
is just silly.

5 years agoarm: get_cabac inline asm
Janne Grunau [Wed, 29 Jan 2014 13:48:22 +0000 (14:48 +0100)]
arm: get_cabac inline asm

Based on the aarch64 asm. CPU cycle counts on cortex-a9 compared to
gcc 4.8.2:
before: 475 decicycles in get_cabac_noinline, 67106035 runs, 2829 skips
after:  393 decicycles in get_cabac_noinline, 67106474 runs, 2390 skips

Overall speedup is above 2%. Code generated by clang 3.4 is slower on
the same hardware and the relative change is a little larger.

5 years agoaarch64: get_cabac inline asm
Janne Grunau [Mon, 13 Jan 2014 00:06:20 +0000 (01:06 +0100)]
aarch64: get_cabac inline asm

Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets
approximately 20% faster (no cycle counts available) compared to clang
from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall
speedup might be explained by additional inlining of get_cabac().

5 years agoarm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Janne Grunau [Sat, 8 Mar 2014 18:15:16 +0000 (19:15 +0100)]
arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating
clear_blocks into the idct.

5 years agoMerge commit 'a801453423420915425f902bf9f9cbe982a55d87'
Michael Niedermayer [Sat, 8 Mar 2014 23:41:47 +0000 (00:41 +0100)]
Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'

* commit 'a801453423420915425f902bf9f9cbe982a55d87':
  g2meet: K&R formatting cosmetics

Conflicts:
libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibzvbi-teletextdec: split dvb packet to slices
Marton Balint [Sat, 1 Mar 2014 01:10:15 +0000 (02:10 +0100)]
libzvbi-teletextdec: split dvb packet to slices

Instead of using the demux function of libzvbi to split the packet to slices
(vbi lines), lets do it ourselves.

- eliminates the 1 frame delay between page input and output
- handles non-ascending line numbers more gracefully
- enables us to return error codes on some invalid packets instead of silently
  ignoring them

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: use av_dlog where possible
Marton Balint [Sat, 1 Mar 2014 22:31:04 +0000 (23:31 +0100)]
libzvbi-teletextdec: use av_dlog where possible

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agobuild: Use pkg-config for openjpeg
Pierre Lejeune [Sat, 8 Mar 2014 12:19:17 +0000 (12:19 +0000)]
build: Use pkg-config for openjpeg

Bug-Id: 387
CC: libav-stable@libav.org
5 years agomovenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:15 +0000 (20:20 +0000)]
movenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
5 years agomatroskaenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
matroskaenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org
5 years agorv10: K&R formatting cosmetics
Keiji Costantini [Sat, 1 Mar 2014 18:44:01 +0000 (19:44 +0100)]
rv10: K&R formatting cosmetics

Also sort #includes into canonical order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agorv10: Forward error from rv10_decode_packet
Keiji Costantini [Sat, 1 Mar 2014 18:44:00 +0000 (19:44 +0100)]
rv10: Forward error from rv10_decode_packet

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agog2meet: K&R formatting cosmetics
Diego Biurrun [Fri, 7 Mar 2014 14:15:02 +0000 (15:15 +0100)]
g2meet: K&R formatting cosmetics

5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 8 Mar 2014 13:48:23 +0000 (14:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMake 32bit RGB dshow input opaque.
Don Moir [Sat, 8 Mar 2014 12:46:05 +0000 (13:46 +0100)]
Make 32bit RGB dshow input opaque.

5 years agoSet codec_tag in dshow device, needed to distinguish between YUV and YVU.
Carl Eugen Hoyos [Sat, 8 Mar 2014 12:42:47 +0000 (13:42 +0100)]
Set codec_tag in dshow device, needed to distinguish between YUV and YVU.

Fixes ticket #3447.

5 years agolavf/concatdec: reindent after last commit.
Nicolas George [Sat, 8 Mar 2014 11:44:45 +0000 (12:44 +0100)]
lavf/concatdec: reindent after last commit.

5 years agolavf/concatdec: more reliable test for absolute URLs.
Nicolas George [Sat, 1 Mar 2014 11:13:11 +0000 (12:13 +0100)]
lavf/concatdec: more reliable test for absolute URLs.

ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.

5 years agolavf: add subfile protocol.
Nicolas George [Tue, 25 Feb 2014 20:50:54 +0000 (21:50 +0100)]
lavf: add subfile protocol.

5 years agolavfi/af_atempo: clear references before returning error.
Nicolas George [Wed, 5 Mar 2014 16:59:38 +0000 (17:59 +0100)]
lavfi/af_atempo: clear references before returning error.

Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.

5 years agolavd/xv: take aspect ratio into account.
Nicolas George [Mon, 25 Nov 2013 16:26:07 +0000 (17:26 +0100)]
lavd/xv: take aspect ratio into account.

5 years agolavc/pthread: copy packet side data.
Nicolas George [Thu, 20 Feb 2014 19:52:06 +0000 (20:52 +0100)]
lavc/pthread: copy packet side data.

5 years agoavcodec/vorbis: fix decoding of single element huffman trees
Michael Niedermayer [Sat, 8 Mar 2014 04:13:05 +0000 (05:13 +0100)]
avcodec/vorbis: fix decoding of single element huffman trees

Fixes Ticket2893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()
Michael Niedermayer [Sat, 8 Mar 2014 03:59:56 +0000 (04:59 +0100)]
avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wmadec: initialize max_exponent to valid values
Michael Niedermayer [Sat, 8 Mar 2014 00:31:42 +0000 (01:31 +0100)]
avcodec/wmadec: initialize max_exponent to valid values

Fixes generation of NaN output
Fixes: nan_example.wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Mar 2014 23:20:56 +0000 (00:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'
Michael Niedermayer [Fri, 7 Mar 2014 23:13:20 +0000 (00:13 +0100)]
Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'

* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '84cfce9f99805a144df684417e166c1ae6f95421'
Michael Niedermayer [Fri, 7 Mar 2014 22:46:37 +0000 (23:46 +0100)]
Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: fix typo
compn [Fri, 7 Mar 2014 22:07:37 +0000 (17:07 -0500)]
doc: fix typo

5 years agodxva2_vc1: include the start code in wMBbitOffset
Hendrik Leppkes [Fri, 7 Mar 2014 13:02:59 +0000 (14:02 +0100)]
dxva2_vc1: include the start code in wMBbitOffset

This resolves a decoding failure on Intel GPUs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: fix intensity compensation condition with interlaced fields
Hendrik Leppkes [Fri, 7 Mar 2014 13:02:58 +0000 (14:02 +0100)]
dxva2_vc1: fix intensity compensation condition with interlaced fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofic: Properly handle skip frames
Derek Buitenhuis [Fri, 7 Mar 2014 14:31:53 +0000 (14:31 +0000)]
fic: Properly handle skip frames

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Mar 2014 13:09:31 +0000 (14:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: cosmetics: Fix "attachement" vs. "attachment" typo
Diego Biurrun [Fri, 7 Mar 2014 12:54:18 +0000 (13:54 +0100)]
matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

5 years agoMerge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'
Michael Niedermayer [Fri, 7 Mar 2014 12:41:08 +0000 (13:41 +0100)]
Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'

* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: K&R formatting cosmetics
Keiji Costantini [Sat, 1 Mar 2014 16:28:15 +0000 (17:28 +0100)]
matroskadec: K&R formatting cosmetics

Also sort #includes into canonical order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'
Michael Niedermayer [Fri, 7 Mar 2014 11:58:39 +0000 (12:58 +0100)]
Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'

* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2':
  rtmppkt: Add a descriptive comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'
Michael Niedermayer [Fri, 7 Mar 2014 11:52:59 +0000 (12:52 +0100)]
Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
  rtmppkt: Handle extended timestamp field even for one-byte header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'
Michael Niedermayer [Fri, 7 Mar 2014 11:44:09 +0000 (12:44 +0100)]
Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
  dict: K&R formatting cosmetics

Conflicts:
libavutil/dict.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmppkt: Rename the ts_delta field to ts_field
Martin Storsjö [Wed, 5 Mar 2014 14:07:37 +0000 (16:07 +0200)]
rtmppkt: Rename the ts_delta field to ts_field

Based on a suggestion by Martin Panter. This is more descriptive,
since it's the actual timestamp field from the RTMP packet,
which might or might not be a delta depending on context (in
some packets it's a delta, in some packets it's an absolute
timestamp, and in some packets it's 0xffffff to indicate that
the actual delta or absolute timestamp is transmitted separately).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmppkt: Properly handle extended timestamps when writing
Martin Panter [Wed, 5 Mar 2014 14:02:18 +0000 (16:02 +0200)]
rtmppkt: Properly handle extended timestamps when writing

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmppkt: Add a descriptive comment
Martin Panter [Wed, 5 Mar 2014 14:00:44 +0000 (16:00 +0200)]
rtmppkt: Add a descriptive comment

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmppkt: Handle extended timestamp field even for one-byte header
Martin Panter [Wed, 5 Mar 2014 04:04:39 +0000 (04:04 +0000)]
rtmppkt: Handle extended timestamp field even for one-byte header

Related fix in "rtmpdump":
https://repo.or.cz/w/rtmpdump.git/commitdiff/79459a2

Adobe's RTMP specification (21 Dec 2012), section 5.3.1.3 ("Extended
Timestamp"), says "this field is present in Type 3 chunks". Type 3 chunks are
those with the one-byte header size.

This resolves intermittent hangs and segfaults caused by the read function,
and also includes an untested fix for the write function.

The read function was tested with ABC (Australia) News 24 streams, however
they are probably restricted to only Australian internet addresses. Some of
the packets at the start of these streams seem to contain junk timestamp
fields, often requiring the extended field. Test command:

avplay rtmp://cp81899.live.edgefcs.net/live/news24-med@28772

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodict: K&R formatting cosmetics
Patrice Clement [Thu, 6 Mar 2014 18:40:56 +0000 (19:40 +0100)]
dict: K&R formatting cosmetics