virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
61,453 Commits 37 Branches 400 Tags 458 MiB
722b48bc12
Commit Graph

61453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
4159f702a7 avutil/timer: Fix units for x86 after c708b54033 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 15:22:02 +01:00
Michael Niedermayer
c2923100f5 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>
 2014-03-09 14:30:24 +01:00
Michael Niedermayer
fa4f573997 Merge commit '634d9d8b398982647b3d7160641198744901d8d8' 
* commit '634d9d8b398982647b3d7160641198744901d8d8':
  arm: get_cabac inline asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 13:37:29 +01:00
Michael Niedermayer
cbee7ff0b7 Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a' 
* commit 'dfe224f377be3e45758c69d881ca7874b82d647a':
  aarch64: get_cabac inline asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 13:27:04 +01:00
Michael Niedermayer
fc1d7811ef 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>
 2014-03-09 13:06:31 +01:00
Michael Niedermayer
920c01adce hevc: Use get_bits_long() in decode_vui() 
Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-03-09 08:25:39 +01:00
Michael Niedermayer
ea9399f8f7 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>
 2014-03-09 02:54:40 +01:00
Michael Niedermayer
9c99bc1f3f 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>
 2014-03-09 02:05:03 +01:00
Michael Niedermayer
9827f3db88 Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c' 
* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 01:50:17 +01:00
Michael Niedermayer
4cb6814160 Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d' 
* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
  matroskaenc: allow override of "writing application" tag

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 01:41:55 +01:00
Michael Niedermayer
b39e895024 Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323' 
* commit '61985ad72c47bbb668f2d3923bf5c9df83e79323':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 01:16:21 +01:00
Michael Niedermayer
2beb81522e Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62' 
* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
  rv10: K&R formatting cosmetics

Conflicts:
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 01:05:37 +01:00
Michael Niedermayer
0c1353ae33 Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13' 
* commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13':
  rv10: Forward error from rv10_decode_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 00:59:00 +01:00
Janne Grunau
74cc901905 float_dsp: fix errors in documentation 2014-03-09 00:45:35 +01:00
Janne Grunau
c708b54033 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.
 2014-03-09 00:45:34 +01:00
Janne Grunau
634d9d8b39 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.
 2014-03-09 00:45:34 +01:00
Janne Grunau
dfe224f377 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().
 2014-03-09 00:45:33 +01:00
Janne Grunau
4506a854a4 arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration 
Was missed in aeaf268e52 when integrating
clear_blocks into the idct.
 2014-03-09 00:45:33 +01:00
Michael Niedermayer
17a5dbacf5 Merge commit 'a801453423420915425f902bf9f9cbe982a55d87' 
* commit 'a801453423420915425f902bf9f9cbe982a55d87':
  g2meet: K&R formatting cosmetics

Conflicts:
	libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 00:41:47 +01:00
Marton Balint
085ca7dcdb 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>
 2014-03-08 21:58:12 +01:00
Marton Balint
ae017c2632 libzvbi-teletextdec: use av_dlog where possible 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-03-08 21:58:12 +01:00
Pierre Lejeune
0e0cefb222 build: Use pkg-config for openjpeg 
Bug-Id: 387
CC: libav-stable@libav.org
 2014-03-08 19:42:32 +01:00
John Stebbins
565e0c6d86 movenc: allow override of "writing application" tag 
Signed-off-by: Tim Walker <tdskywalker@gmail.com>

CC: libav-stable@libav.org
 2014-03-08 18:59:35 +01:00
John Stebbins
0092c1dd8d matroskaenc: allow override of "writing application" tag 
Signed-off-by: Tim Walker <tdskywalker@gmail.com>

CC: libav-stable@libav.org
 2014-03-08 18:56:49 +01:00
Janne Grunau
61985ad72c arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 
The overread avoidance fix in cbddee1cca
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org
 2014-03-08 18:31:57 +01:00
Keiji Costantini
8c09532672 rv10: K&R formatting cosmetics 
Also sort #includes into canonical order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-08 17:41:59 +01:00
Keiji Costantini
b4d372e091 rv10: Forward error from rv10_decode_packet 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-08 17:19:56 +01:00
Diego Biurrun
a801453423 g2meet: K&R formatting cosmetics 2014-03-08 16:35:20 +01:00
Michael Niedermayer
b28c371567 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>
 2014-03-08 15:00:36 +01:00
Don Moir
24e2a82f75 Make 32bit RGB dshow input opaque. 2014-03-08 13:46:05 +01:00
Carl Eugen Hoyos
6208bb965d Set codec_tag in dshow device, needed to distinguish between YUV and YVU. 
Fixes ticket #3447.
 2014-03-08 13:42:47 +01:00
Nicolas George
6bffa83bbe lavf/concatdec: reindent after last commit. 2014-03-08 12:44:45 +01:00
Nicolas George
8a670f52a5 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.
 2014-03-08 12:38:31 +01:00
Nicolas George
97e87e09c8 lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
Nicolas George
bc6901c949 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.
 2014-03-08 12:31:00 +01:00
Nicolas George
c37bbe54f4 lavd/xv: take aspect ratio into account. 2014-03-08 12:29:32 +01:00
Nicolas George
ea6825fd09 lavc/pthread: copy packet side data. 2014-03-08 12:27:02 +01:00
Michael Niedermayer
742d860103 avcodec/vorbis: fix decoding of single element huffman trees 
Fixes Ticket2893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 05:13:05 +01:00
Michael Niedermayer
b918d6e2e6 avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 04:59:56 +01:00
Michael Niedermayer
d1122b7ce5 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>
 2014-03-08 01:46:22 +01:00
Michael Niedermayer
6eb08783a9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 00:21:22 +01:00
Michael Niedermayer
fabf69f37a Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a' 
* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 00:13:20 +01:00
Michael Niedermayer
b3d9ab1829 Merge commit '84cfce9f99805a144df684417e166c1ae6f95421' 
* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 23:52:44 +01:00
compn
84bccae8e9 doc: fix typo 2014-03-07 17:07:37 -05:00
Hendrik Leppkes
61ff0431ba dxva2_vc1: include the start code in wMBbitOffset 
This resolves a decoding failure on Intel GPUs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 16:03:50 +01:00
Hendrik Leppkes
930f67b712 dxva2_vc1: fix intensity compensation condition with interlaced fields 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 16:03:03 +01:00
Derek Buitenhuis
f87a6e500b fic: Properly handle skip frames 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-07 14:54:33 +00:00
Michael Niedermayer
4fc339faea Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 14:09:35 +01:00
Diego Biurrun
f69befe5ee matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo 2014-03-07 13:54:18 +01:00
Michael Niedermayer
9baef60ae4 Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3' 
* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 13:42:22 +01:00