eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 21:25:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,691 Commits 38 Branches 415 Tags
b92ef485c712fe8af2c32ddd28e4470abcb7e5ff
Commit Graph

16602 Commits

Author SHA1 Message Date
Michael Niedermayer
b92ef485c7 Fix all GNU %Ld 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9aeaf62903)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 21:46:45 +01:00
Michael Niedermayer
6289b6c811 twinnvq: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35f707abe1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 21:46:43 +01:00
Michael Niedermayer
964912aba5 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  Warn about avserver being broken.
  avconv: drop code for special handling of avserver streams.
  rawdec: don't set codec timebase.
  lavf doxy: add muxing stuff to lavf_encoding group
  lavf doxy: add demuxing stuff to lavf_decoding group
  lavf doxy: expand/reword metadata API doxy.
  lavf doxy: add installed headers to groups.
  lavf doxy: add avio groups into the lavf_io group.
  lavf doxy: rename lavf I/O group to lavf_io.
  lavf doxy: add metadata docs to the main lavf group
  ttadec: check channel count as read from extradata.
  Add CLJR encoding and decoding regression tests
  cljr: remove unused code
  flacdec: Support for tracks in cuesheet metadata block
  ptx: fix inverted check for sufficient data
  flac muxer: fix writing of file header and STREAMINFO header from extradata
  ptx: emit a warning on insufficient picture data
  utvideo: add fate tests covering all codec variants
  doc: update to refer to avconv
  doc: remove some stale entries from the faq
  ...

Conflicts:
	Changelog
	avconv.c
	doc/avconv.texi
	doc/faq.texi
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/avcodec.h
	libavcodec/cljr.c
	libavformat/avformat.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 01:05:33 +01:00
Michael Niedermayer
3dea28cc2e h264: Fix concealment regression introduced by babf4fe01a 
Limit the new case to when the decoder is flushed instead of at each idr frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 23:26:38 +01:00
Michael Niedermayer
8743400961 h264: reset prev_poc_msb to the same value everywhere. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 23:03:49 +01:00
Shitiz Garg
8bd1f1a4c8 ttadec: check channel count as read from extradata. 
fixes floating-point exception due to channels being set to 0.
fixes Bug 128.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-10 14:54:19 -05:00
Paul B Mahol
65c1011404 cljr: remove unused code 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-10 20:11:28 +01:00
Michael Niedermayer
cc61643123 h264: improve "no picture" debug output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Michael Niedermayer
5b2873c1d5 h264: switch from qatars has_b_frames calculation back to mine. 
Their 2nd try does like the first not work at all.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Michael Niedermayer
257c85cddd adpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and -r 0.001:1 
Bug-Found-by: Shitiz Garg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Janne Grunau
8d61eef917 ptx: fix inverted check for sufficient data 
Fix regression introduced in 2b53e69.
 2011-12-10 17:01:27 +01:00
Janne Grunau
2b53e696c8 ptx: emit a warning on insufficient picture data 
Return the whole packet as consumed in this case and not the size the
packet should have had. Move the insufficient data check into the for
condition to fix a ISO C90 error on bigendian.
 2011-12-10 15:29:54 +01:00
Kostya Shishkov
19341c58e0 Dxtory capture format decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-10 11:58:03 +01:00
Michael Niedermayer
f5ecc4c616 lavc: 1000l, unbreak ABI 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 07:03:20 +01:00
Michael Niedermayer
02ce07f8c4 amvenc: support videos with heights that are not a multiple of 16. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 06:39:57 +01:00
Paul B Mahol
85cd1eb12f add missing long_name for amv and dca encoder 
Reviewed-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 05:02:00 +01:00
Hendrik Leppkes
b7bf93b923 mlp: Use correct speaker locations in TrueHD channel layout. 
(cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 02:11:24 +01:00
Michael Niedermayer
5b98ea1b73 vb: Add some checks on input buffer related values. 
Fixes crash with INTRO_FAIL.VB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 23:46:16 +01:00
Michael Niedermayer
4557d7d01f libx264: workaround a bug in some versions of flash player 
Fixes Ticket570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 22:56:36 +01:00
Michael Niedermayer
523da37f4c cljrenc: 2x2 ordered dither support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 19:04:47 +01:00
Michael Niedermayer
74d9b21340 cljrenc: add AVOption to disable dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 19:04:47 +01:00
Michael Niedermayer
43a36ad2ee cljrenc: Add dither to avoid the banding artifcats caused by the very low 
number of bits used to represent brightness levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 01:11:06 +01:00
Michael Niedermayer
25b9eef410 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cljr: K&R cosmetics
  cljr: return a more sensible value when encountering invalid headers
  cljr: drop unnecessary emms_c() calls without MMX code
  cljr: remove useless casts
  cljr: group encode/decode parts under single ifdefs
  cljr: remove stray semicolon
  cljr: add missing return statement in decode_end()
  doc: add pulseaudio to the input list
  avconv: remove unsubstantiated comment
  shorten: avoid abort() on unknown audio types
  cljr: add encoder
  build: merge lists of HTML documentation targets
  tests/examples: Mark some variables only used within their files as static.
  tests/tools/examples: Replace direct exit() calls by return.
  x86 cpuid: set vendor union members separately
  cljr: release picture at end of decoding
  rv40: NEON optimised rv40 qpel motion compensation

Conflicts:
	doc/examples/muxing.c
	libavcodec/cljr.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-09 00:05:51 +01:00
Diego Biurrun
6b60a4c9c9 cljr: K&R cosmetics 2011-12-08 20:28:27 +01:00
Diego Biurrun
1c45c64c9d cljr: return a more sensible value when encountering invalid headers 2011-12-08 20:28:27 +01:00
Diego Biurrun
163682fab3 cljr: drop unnecessary emms_c() calls without MMX code 2011-12-08 20:28:26 +01:00
Michael Niedermayer
15c481614b Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Pass pointer to integer buffer instead of integer to memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 18:44:46 +01:00
Michael Niedermayer
bef8dfa056 escape130: replace can_safely_read() by get_bits_left() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 18:31:32 +01:00
Michael Niedermayer
f7da12350e escape130: give all av_log() a context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 18:31:32 +01:00
Michael Niedermayer
40d6296095 escape130: The minimum read in and after decode_skip_count() is 4 bits. 
Thus we can check for 4 being available.
If the next block is skiped we need 4 bits to encode the skip. If the
next block is not skiped then we need 1 bit for the skip code and
at least 3 bits for the block.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 18:31:32 +01:00
Michael Niedermayer
59d3656f6e escape130: Check dimensions to be a multiple of the block size. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 18:31:21 +01:00
Mashiat Sarker Shakkhar
6d4deecfdf Pass pointer to integer buffer instead of integer to memcpy 2011-12-08 22:53:36 +06:00
Carl Eugen Hoyos
8ac6469575 Silence a warning when compiling Escape 130 decoder. 
Fixes:
libavcodec/escape130.c:177:17: warning: ISO C90 forbids mixed declarations and code

Reviewed-by: Paul B Mahol
 2011-12-08 17:14:47 +01:00
Mans Rullgard
bbc10185ee cljr: remove useless casts 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-08 15:56:31 +00:00
Mans Rullgard
baf3b6e594 cljr: group encode/decode parts under single ifdefs 
This groups the encode/decode parts under single ifdefs and
eliminates the encode_init() function as it merely calls
common_init().  Also fix whitespace in moved code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-08 15:56:30 +00:00
Mans Rullgard
9a1420bfda cljr: remove stray semicolon 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-08 15:56:30 +00:00
Paul B Mahol
ca52bae6ec cljr: add missing return statement in decode_end() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-08 14:44:05 +00:00
Michael Niedermayer
31c55c572a escape130: 10l for myself for not initializing y_base. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 13:25:40 +01:00
John Brooks
8562d9bd6c shorten: avoid abort() on unknown audio types 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-08 11:30:24 +01:00
Paul B Mahol
e93947b7d8 cljr: add encoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-08 09:47:53 +01:00
Michael Niedermayer
06798c6e3b escape130: Fix y_base handling, this fixes some artifacts, vissible in most videos. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 06:01:50 +01:00
Michael Niedermayer
8ff3d1ccec escape130: make sure cliping is done on signed values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 05:59:36 +01:00
Michael Niedermayer
4f79c7dd08 Merge remote-tracking branch 'richardpl/escape130' 
* richardpl/escape130:
  escape130: fix colors
  escape130: remove trailing whitespace
  rpl: enable escape130 codec
  escape130: minimal effort to make it compile without warnings
  Escape 130 (RPL) decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 05:47:27 +01:00
Carl Eugen Hoyos
0cc9949ead Mark one colour as transparent in the gif image encoder 
if the input palette contains at least one colour
that is more than 50% transparent.

Fixes ticket #715.
 2011-12-08 02:48:31 +01:00
Carl Eugen Hoyos
51d7cd3596 Decode RGB ljpeg to RGB24. 
No alpha channel is decoded, the output used to be completely transparent.
 2011-12-08 02:45:53 +01:00
Carl Eugen Hoyos
9608e3a182 Support decoding 56 byte BMP Bitmap Information Header. 
Fixes ticket #719.
 2011-12-08 02:45:53 +01:00
Anatoliy Wasserman
6778f9d9f2 pthread: fixed thread initialization issues related to thread-safe buffer allocator 
Signed-off-by: Anatoliy Wasserman <anatoliy.wasserman@yandex.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 02:01:21 +01:00
Diego Biurrun
4dccfff9dd tests/examples: Mark some variables only used within their files as static. 2011-12-08 01:01:00 +01:00
Diego Biurrun
9a5d6c23c5 tests/tools/examples: Replace direct exit() calls by return. 2011-12-08 01:00:58 +01:00
Michael Niedermayer
ec8a3e25d8 Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Partially fix CDLMS prediction

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 00:37:55 +01:00