RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-07 15:50:43 +00:00
Code Issues Projects Releases Wiki Activity
53,791 Commits 37 Branches 400 Tags 252 MiB
c3660c3618
Commit Graph

53791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c3660c3618 Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423' 
* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423':
  vmd: fix mode 3 decoding

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:21:25 +02:00
Michael Niedermayer
45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 11:53:05 +02:00
Michael Niedermayer
7cb5467a52 Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee' 
* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 11:44:11 +02:00
Michael Niedermayer
2976e2a102 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/trim: mark link closed on EOF.
  ffmpeg: ignore EOF when pushing frames to filters.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 02:59:14 +02:00
Paul B Mahol
d2021f74ed jpeg2000dec: remove redundant error log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 00:20:08 +00:00
Paul B Mahol
a44d39ae42 wavpack: remove redundant error log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 00:20:04 +00:00
Paul B Mahol
0f740fea85 tta: use interger instead of pointer to iterate output samples for 24-bit case 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 22:43:31 +00:00
Paul B Mahol
e2f89f7804 tta: move GetBitContext out of private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 22:38:16 +00:00
Nicolas George
50a4d076ce lavfi/trim: mark link closed on EOF. 
Fix trac ticket #2620.
 2013-06-02 23:19:42 +02:00
Nicolas George
fc82f4a1f8 ffmpeg: ignore EOF when pushing frames to filters. 
EOF is not a fatal condition, it is normally produced
by a few filters.

TODO: take it into account to avoid useless decoding.
 2013-06-02 23:19:42 +02:00
Michael Niedermayer
582f36ca3f tools/qt-faststart: Fix unintended sign extension of current_offset 
Fixes: CID733809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 23:10:44 +02:00
Michael Niedermayer
69ce34c796 tools/qt-faststart: Fix unintended sign extension of atom_size 
Fixes CID733810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 23:10:31 +02:00
Michael Niedermayer
c1075d6af7 tools/ffhash: close file handle on error 
Fixes CID1026768

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 22:52:23 +02:00
Michael Niedermayer
de488525e5 tools/ffeval: Check return value of av_expr_parse_and_eval() 
Fixes CID1026745

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 22:48:03 +02:00
Kostya Shishkov
0aed0bfc62 vmd: fix mode 3 decoding 2013-06-02 19:07:31 +02:00
Michael Niedermayer
636c2dd438 avutil/sha: reorder Maj arguments 
about 1% speedup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 18:51:09 +02:00
Diego Biurrun
c011ceef78 swscale: ppc: Remove commented-out define cruft 2013-06-02 18:11:59 +02:00
Diego Biurrun
9f84ed8cc3 nsvdec: Remove commented-out debug cruft 2013-06-02 18:11:58 +02:00
Diego Biurrun
f0ce1d9909 cpu: Restructure code to avoid pointless ret variable indirection 
libavutil/cpu.c:133:9: warning: unused variable ‘ret’ [-Wunused-variable]
 2013-06-02 18:05:08 +02:00
Diego Biurrun
46ce9ded96 tiff: K&R formatting cosmetics 2013-06-02 17:59:34 +02:00
Paul B Mahol
514cb9bb92 tta encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 15:16:52 +00:00
Paul B Mahol
2e67dde954 tta: move code that will be shared with encoder to separate file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 14:53:14 +00:00
Carl Eugen Hoyos
a4b5863eea Fix compilation of libavcodec/tiff.c 2013-06-02 16:50:39 +02:00
Paul B Mahol
379ad9788b tiff: planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 14:22:40 +00:00
Michael Niedermayer
09d6beee24 avutil/sha512: Reshuffle Maj() operands 
This reduces dependancy chains and improves speed by about 2%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 13:18:16 +02:00
James Almer
682b2273e8 lavu: Add SHA-2 512 hashing 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:27:19 +02:00
Michael Niedermayer
a40370661d use Kostyas full name in copyrights 
This fixes 2 files that where not part of the original change
See: de421b2085

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:25:56 +02:00
Michael Niedermayer
54ddbb477b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  network: factor out connect-listening code

Conflicts:
	libavformat/network.h
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:02:02 +02:00
Michael Niedermayer
4d4f5911d3 Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f' 
* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 10:30:35 +02:00
Michael Niedermayer
5711e4fd11 fate: use TARGET_SAMPLES in mcdeint tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 02:03:39 +02:00
Paul B Mahol
58b36959dd tta: use get_unary() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-01 23:06:04 +00:00
Michael Niedermayer
c28aafe6c0 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
  ffplay: do not allow wider window than 16383
  ffplay: use 0 frame delay if redisplaying an already displayed frame
  ffplay: use more sane frame timer resetting logic
  ffplay: only update pts if not redisplaying a frame
  ffplay: fix compute_target_delay to better handle frames with long durations
  ffplay: if playing only audio or video only, show the master clock diff in status line
  ffplay: factorize clock functions
  ffplay: decrease video picture queue size to 3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 23:47:01 +02:00
Stefano Sabatini
ec34963276 lavfi/mp: drop mcdeint wrapper 
It was ported to a native libavfilter filter.
 2013-06-01 22:35:20 +02:00
Stefano Sabatini
5fa252b212 tests: add mcdeint tests 2013-06-01 22:35:04 +02:00
Stefano Sabatini
e89182fc94 lavfi: port mcdeint filter from libmpcodecs 2013-06-01 22:34:57 +02:00
Stefano Sabatini
3a2b9911bf lavfi/mp/mcdeint: avoid uninited data read 
Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.

This avoids non visible artifacts which affected the output checksum.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200
 2013-06-01 22:34:50 +02:00
Clément Bœsch
534f1a2821 lavc/avcodec: decodimg → decoding. 2013-06-01 19:16:45 +02:00
Carl Eugen Hoyos
f514b5dff7 Fix libcdio-paranoia detection. 
Fixes ticket #2614.
 2013-06-01 18:34:51 +02:00
Luca Barbato
f849a77e67 network: factor out connect-listening code 
Introduce ff_listen_connect, to be shared with the other
non-tcp network protocols.
 2013-06-01 15:29:53 +02:00
Luca Barbato
28306e6d62 network: factor out bind-listening code 
Introduce ff_listen_bind, to be shared with the other non-tcp
network protocols.
 2013-06-01 15:29:53 +02:00
Clément Bœsch
07f6a66bf5 lavf/webvttdec: factorize identifier and settings side data code. 2013-06-01 15:12:49 +02:00
Matthew Heaney
8f75ba9926 lavf/webvttdec: save cue id and settings as side data 
Currently the WebVTT demuxer parses the cues but throws away
the cue id (the optional first line of the cue) and cue
settings (the optional rendering instructions that follow
the timestamp).

However, in order to write inband text tracks (to WebM
files), the entire cue payload from the WebVTT source must
be preserved.

This commit makes no change to the data part of the output
buffer packet (where the actual cue text is stored), but
does add the cue id and settings as a side data items, if
they're present in the cue. Existing code that cares only
about the data part of the packet can continue to ignore the
side data.

There are two new packet data type flags,
AV_PKT_DATA_WEBVTT_IDENTIFIER and
AV_PKT_DATA_WEBVTT_SETTINGS.
 2013-06-01 15:12:49 +02:00
Clément Bœsch
151b4947e5 lavc/avpacket: fill padding area on side data split. 
The padding data is assumed to be 0 in several places, notably in
subtitles. This problem was not detected with fate-sub-srt test because
the first element of the side data (x1) is 0 in the test, so the
trailing side data present in the packet wasn't read by the decoder. The
issue can be observed with a large enough x1.

It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG
bitstreams require that padding with 0, so it might fix other issues.
 2013-06-01 15:12:49 +02:00
Michael Niedermayer
9054e72529 jpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is deallocated 
This keeps the structure fields more consistent after cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 14:41:46 +02:00
Kostya Shishkov
de421b2085 use my full first name instead of short one in copyrights 2013-06-01 13:38:50 +02:00
Marton Balint
30d724bdfd ffplay: detect when the created overlay buffers are not valid for the wanted overlay height 
Fixes cases when the picture height was bigger than the maximum supported
overlay height...

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
87917a3283 ffplay: do not allow wider window than 16383 
SDL surface pitch is 16bit, to avoid possible overflows, we limit the window
width to 16383. Fixes ticket #2428.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
3b6f1526c6 ffplay: use 0 frame delay if redisplaying an already displayed frame 
With the previous patches this finally fixes ticket #1707.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
97e42551e4 ffplay: use more sane frame timer resetting logic 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00
Marton Balint
35b2f30fd1 ffplay: only update pts if not redisplaying a frame 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-01 12:50:46 +02:00