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

5 years agodoc/APIchanges: update versions & hashes
Michael Niedermayer [Wed, 5 Mar 2014 20:10:42 +0000 (21:10 +0100)]
doc/APIchanges: update versions & hashes

5 years agodxva2_h264: add a workaround for old intel GPUs
Hendrik Leppkes [Tue, 4 Mar 2014 07:28:39 +0000 (08:28 +0100)]
dxva2_h264: add a workaround for old intel GPUs

Old Intel GPUs expect the reference frame index to the actual surface,
instead of the index into RefFrameList as specified by the spec.

This workaround should be set when using one of the "ClearVideo" decoder
devices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_h264: set the correct ref frame index in the long slice struct
Hendrik Leppkes [Tue, 4 Mar 2014 07:28:38 +0000 (08:28 +0100)]
dxva2_h264: set the correct ref frame index in the long slice struct

The latest H.264 DXVA specification states that the index in this
structure should refer to a valid entry in the RefFrameList of the picture
parameter structure, and not to the actual surface index.

Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy)

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

* qatar/master:
  libx265: Support API version 9

See: 69ead9af7519796eebbc452fbbdb43af8d846173
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'
Michael Niedermayer [Thu, 6 Mar 2014 23:03:40 +0000 (00:03 +0100)]
Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'

* commit 'b66382101cff33e2ce66500327a90d0a105eedeb':
  dxva2: Increase maximum number of slices for mpeg2

See: bceeccc648baf94a02b7b2c53e44bf77a47773ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'
Michael Niedermayer [Thu, 6 Mar 2014 22:53:36 +0000 (23:53 +0100)]
Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'
Michael Niedermayer [Thu, 6 Mar 2014 22:44:29 +0000 (23:44 +0100)]
Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
libavformat/mxfdec.c

See: f5ed83c3831fcaca0f87cd67ca743946a54023d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '570af382eea902afe09f3562e5e1b483981cca7e'
Michael Niedermayer [Thu, 6 Mar 2014 21:58:46 +0000 (22:58 +0100)]
Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
libavformat/mxfdec.c

See: 25b143aa7bd60d348a449be64dadab61f0c7d068
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'
Michael Niedermayer [Thu, 6 Mar 2014 21:39:18 +0000 (22:39 +0100)]
Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
  mxf: Set audio packets pts

Conflicts:
libavformat/mxfdec.c

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
Michael Niedermayer [Thu, 6 Mar 2014 21:19:01 +0000 (22:19 +0100)]
Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
libavformat/mxf.c
libavformat/mxf.h

See: 906a2638139bfcce17d423cfa3a8ee633b38a2af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd48430c367947a64647c6959cf472f2c01778b17'
Michael Niedermayer [Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)]
Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '84bf8817206126dab3c9abf6055b593389bcb241'
Michael Niedermayer [Thu, 6 Mar 2014 20:58:46 +0000 (21:58 +0100)]
Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Support API version 9
Derek Buitenhuis [Thu, 6 Mar 2014 20:01:17 +0000 (20:01 +0000)]
libx265: Support API version 9

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoFix spelling errors in texi files: accomodate -> accommodate allows to -> allows...
Andreas Cadhalpun [Thu, 6 Mar 2014 18:07:53 +0000 (19:07 +0100)]
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix spelling error 'Inconsistant -> Inconsistent'
Andreas Cadhalpun [Thu, 6 Mar 2014 18:03:07 +0000 (19:03 +0100)]
Fix spelling error 'Inconsistant -> Inconsistent'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoCorrect the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor...
Andreas Cadhalpun [Thu, 6 Mar 2014 17:58:04 +0000 (18:58 +0100)]
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2: Increase maximum number of slices for mpeg2
Rainer Hochecker [Thu, 6 Mar 2014 13:40:43 +0000 (14:40 +0100)]
dxva2: Increase maximum number of slices for mpeg2

Some content requires an higher number of slices in order to
render properly.

Rise the number to 1024 and warn if ever it exceeds.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Return meaningful errors
Luca Barbato [Wed, 8 Jan 2014 00:51:48 +0000 (01:51 +0100)]
mxf: Return meaningful errors

5 years agomxf: Parse random index pack
Paul B Mahol [Fri, 18 Oct 2013 10:44:56 +0000 (10:44 +0000)]
mxf: Parse random index pack

Get the last partition offset and use it when footer partition
offset is missing.

Footer partition may not be present and even if present footer
partition offset may not be set in any partition except last one.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Handle identification metadata
Matthieu Bouron [Fri, 29 Mar 2013 13:09:31 +0000 (14:09 +0100)]
mxf: Handle identification metadata

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Set audio packets pts
Matthieu Bouron [Thu, 13 Sep 2012 19:15:48 +0000 (21:15 +0200)]
mxf: Set audio packets pts

Extrapolate audio timestamps based on the number of samples demuxed.

Deal with some MXF nastiness involving fractional number of
samples per EditUnit when seeking (the specs handwave this away).

Further fixes from Tomas Härdin.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Introduce ff_mxf_get_samples_per_frame
Matthieu Bouron [Thu, 20 Sep 2012 18:31:28 +0000 (20:31 +0200)]
mxf: Introduce ff_mxf_get_samples_per_frame

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agox86/dsputil: add emms to ff_scalarproduct_int16_mmxext()
James Almer [Wed, 5 Mar 2014 22:44:36 +0000 (19:44 -0300)]
x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()

Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: Let the SVQ3 decoder depend on the H.264 decoder
Diego Biurrun [Thu, 6 Mar 2014 12:04:03 +0000 (13:04 +0100)]
build: Let the SVQ3 decoder depend on the H.264 decoder

The SVQ3 decoder reuses large parts of the H.264 decoder so it
makes no sense to enable the former but not the latter.

Also drop unnecessary h263.o object from SVQ3 decoder object list.

5 years agolibx265: Use ctx->vui. instead of ctx-> for some options A recent change in libx265...
sfan5 [Thu, 6 Mar 2014 15:00:30 +0000 (16:00 +0100)]
libx265: Use ctx->vui. instead of ctx-> for some options A recent change in libx265 moved some options such as sar_width into a 'vui' struct.

Signed-off-by: sfan5 <sfan5@live.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
Michael Niedermayer [Thu, 6 Mar 2014 15:58:24 +0000 (16:58 +0100)]
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/Makefile: Add fbdev_common.h to SKIPHEADERS
James Almer [Thu, 6 Mar 2014 04:39:25 +0000 (01:39 -0300)]
lavd/Makefile: Add fbdev_common.h to SKIPHEADERS

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Mar 2014 13:59:58 +0000 (14:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_shuffleplanes: fix the type of the mapping indices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
Michael Niedermayer [Thu, 6 Mar 2014 13:09:48 +0000 (14:09 +0100)]
Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'

* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
  x86: dcadsp: Fix linking with yasm and optimizations disabled

Conflicts:
libavcodec/x86/dcadsp_init.c

See: 206167a295a5c28cec3c38f7308835b0b7e0618f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Split x86 SIMD architecture extensions into separate list
Diego Biurrun [Sat, 2 Nov 2013 16:21:53 +0000 (17:21 +0100)]
configure: Split x86 SIMD architecture extensions into separate list

This avoids checking inline/external assembly dependencies for x86
extensions that do not play a role in inline/external assembly.

5 years agoMerge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'
Michael Niedermayer [Thu, 6 Mar 2014 12:09:06 +0000 (13:09 +0100)]
Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f':
  FATE: add tests for the shuffleplanes filter

Conflicts:
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '599b81ca9a8e04a27ddad94af462171d16063167'
Michael Niedermayer [Thu, 6 Mar 2014 11:51:10 +0000 (12:51 +0100)]
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
Michael Niedermayer [Thu, 6 Mar 2014 11:38:05 +0000 (12:38 +0100)]
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
  lavfi: use the correct filter context for logging an error.

Merged-by: Michael Niedermayer <michaelni@gmx.at>