virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
69,839 Commits 37 Branches 400 Tags 460 MiB
f9240ec01a
Commit Graph

69839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
f9240ec01a avcodec/gif: fix off by one in column offsetting finding 2015-02-16 17:47:35 +01:00
Seppo Tomperi
e40e446efd hevcdsp: HEVC deblocking ARM NEON register clobber fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 13:27:41 +01:00
zhaoxiu.zeng
0f83415569 avcodec/vc1_mc: move median4() to mathops.h 
Needed for architecture specific optimizations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 11:41:00 +01:00
James Almer
03adafb318 x86/g722dsp: add ff_g722_apply_qmf_sse2 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-16 00:41:21 -03:00
Michael Niedermayer
e97a9666ef Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' 
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
	libavdevice/bktr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:56:17 +01:00
Michael Niedermayer
815daf1607 Merge commit '3a651f599a18b023602370b67a77eb0efa309b20' 
* commit '3a651f599a18b023602370b67a77eb0efa309b20':
  dca: Move data tables from a header to an object file

Conflicts:
	libavcodec/Makefile
	libavcodec/dcadata.h
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:49:22 +01:00
Michael Niedermayer
9d4f836627 Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda' 
* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
  dca: Add array sizes to array declarations

Conflicts:
	libavcodec/dcadata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:29:41 +01:00
Michael Niedermayer
e86f754b1c Merge commit '702458538d4e52809bcef460d39baabf061b16b5' 
* commit '702458538d4e52809bcef460d39baabf061b16b5':
  g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:
	libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:16:29 +01:00
Michael Niedermayer
39b40be2a1 Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3' 
* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
  g722: Split out computation of band->s_zero and unroll code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:07:42 +01:00
Michael Niedermayer
9e0a1bd2b9 Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc' 
* commit 'b16057b5fe9f02442c52388037891c2e381205fc':
  g722: Unroll g722_apply_qmf()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:00:53 +01:00
Michael Niedermayer
9f1792982e Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8' 
* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
  g722: Reduce number of pointers passed to g722_apply_qmf() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 01:54:19 +01:00
Michael Niedermayer
47df21e172 Merge commit '67690683130faf37dd9d969ced15eba2a1940ade' 
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
  g722: Split out g722_qmf_apply() function into g722dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 01:46:35 +01:00
Michael Niedermayer
38e641a060 avformat/mov: Bypass av_add_index_entry() 
The new mov code uses a temporally non sorted index since 4abfa387b8
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387b8 and this commit would be
a alternative fix as would be various other options.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 01:30:47 +01:00
Michael Niedermayer
f9e76d66e9 Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843' 
* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
  mov: Change DTS-based seek into CTS-based seek.

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 01:28:02 +01:00
Himangi Saraogi
81ef46020f bktr: Use av_strerror and propagate error codes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2015-02-15 13:42:31 -08:00
Diego Biurrun
3a651f599a dca: Move data tables from a header to an object file 
This allows sharing them with the DCA XLL extension w/o duplication.
 2015-02-15 13:34:04 -08:00
Diego Biurrun
65df9904ce dca: Add array sizes to array declarations 2015-02-15 13:34:04 -08:00
Michael Niedermayer
7b564a4cbb Merge commit '51ca3cb604a7585a7cff35d4b954794508955c19' 
* commit '51ca3cb604a7585a7cff35d4b954794508955c19':
  xcbgrab: Use the correct geometry for the region highlight

See: 0ae37e460c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:51:11 +01:00
Peter Meerwald
702458538d g722: Add ARM NEON implementation for g722_apply_qmf() 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 22:47:21 +02:00
Peter Meerwald
73ae0a9d12 g722: Split out computation of band->s_zero and unroll code 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 22:47:19 +02:00
Peter Meerwald
b16057b5fe g722: Unroll g722_apply_qmf() 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 22:47:16 +02:00
Peter Meerwald
10f160768b g722: Reduce number of pointers passed to g722_apply_qmf() function 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 22:47:14 +02:00
Peter Meerwald
6769068313 g722: Split out g722_qmf_apply() function into g722dsp.c 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 22:47:10 +02:00
Michael Niedermayer
2870b86c2a Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6' 
* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:43:28 +01:00
Michael Niedermayer
fa321cc0c8 Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b' 
* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
	libavformat/oggenc.c

See: 0f62982335
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:34:06 +01:00
Michael Niedermayer
f3b6a8f554 Merge commit '53367b34e1156614e82ef7af888928f322566f88' 
* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
	libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:20:25 +01:00
Michael Niedermayer
a848cf63dc Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7' 
* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:09:47 +01:00
Michael Niedermayer
2d2c744f8f Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0' 
* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 21:03:47 +01:00
Michael Niedermayer
8f00d7f4b4 Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b' 
* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:57:49 +01:00
Michael Niedermayer
3773b6edea Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c' 
* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
  rtp: h264: Move profile_level_id parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:49:21 +01:00
Michael Niedermayer
3171ac209b Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42' 
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

See: 8c0ae9015a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:42:52 +01:00
Michael Niedermayer
7d56aab2de Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff' 
* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
  xcbgrab: Check for xcb-shape

Conflicts:
	configure

See: 792f0f2045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:39:36 +01:00
Yusuke Nakamura
4abfa387b8 mov: Change DTS-based seek into CTS-based seek. 
CTS-based seek is reasonable since player requests frames in output order
not coded order.

This change fixes seek to a keyframe within consecutive keyframes.
Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS
respectively, and both two frames are a keyframe. If you try to seek on
PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This
is obviously undesirable.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-15 21:26:04 +02:00
Michael Niedermayer
fe03456cdc Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148' 
* commit 'e21d85309943a51b7808f5e01dd258b262e09148':
  FATE: add a test for the SVQ1 header byte swapping

Conflicts:
	tests/fate/qt.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:25:31 +01:00
Michael Niedermayer
8242946af2 Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e' 
* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
  changelog: mention DXVA/HEVC and AAC ELD480

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:08:21 +01:00
Michael Niedermayer
543e329a26 avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)" 
Found-by: Loriker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 19:51:05 +01:00
Thomas Volkert
cbe508553a avformat/rtpdec: DV depacketizer (RFC 6469) 
Tested with live555 RTSP server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 19:35:19 +01:00
Reynaldo H. Verdejo Pinochet
df4346c541 ffserver: fix wrong indentation 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-02-15 15:15:41 -03:00
Reynaldo H. Verdejo Pinochet
bd8e16f2e6 ffserver: decouple assignment and check 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-02-15 15:15:41 -03:00
Reynaldo H. Verdejo Pinochet
50c1cac432 ffserver: break too-long lines 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-02-15 15:15:41 -03:00
Reynaldo H. Verdejo Pinochet
8129ccec3a ffserver: reorder HTTP fwd decls 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-02-15 15:15:40 -03:00
Daniel Moran
51ca3cb604 xcbgrab: Use the correct geometry for the region highlight 
The feature is implemented using a transparent window and drawing
inside it a rectangle filling the whole window to highlight it.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-15 18:20:54 +01:00
Luca Barbato
e1a57cbb1c ape: Use the proper variable type 
Avoid an unsigned underflow.

Bug-Id: 1041122
CC: libav-stable@libav.org
 2015-02-15 18:20:54 +01:00
Federico Tomassetti
b4cda0a999 ogg: check memory allocations 
Bug-Id: CID 1257795
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-15 18:20:54 +01:00
Luca Barbato
53367b34e1 rtp: h264: Drop the asserts 2015-02-15 18:20:54 +01:00
Luca Barbato
3b33dfb23c rtp: h264: Move FU-A NAL parsing to a function 2015-02-15 18:20:54 +01:00
Luca Barbato
f0a8747996 rtp: h264: Move STAP-A NAL parsing to a function 2015-02-15 18:20:54 +01:00
Luca Barbato
a9a0b8d6c1 rtp: h264: Move parse_sprop_parameter_sets parsing to a function 2015-02-15 18:20:54 +01:00
Luca Barbato
b8df0b71c5 rtp: h264: Move profile_level_id parsing to a function 2015-02-15 18:20:54 +01:00
Luca Barbato
d40815a982 xcbgrab: Correctly make shm optional 
The segment field in the struct has to be conditionally build
as well.
 2015-02-15 18:20:54 +01:00