virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
35,553 Commits 37 Branches 400 Tags 463 MiB
59d3656f6e
Commit Graph

35553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Nicolas George
e91c088055 lavf: lower the log level of "parser not found". 
The information is relevant, but under normal circumstances
it raises far too many false alarms.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 13:04:02 +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
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
Michael Niedermayer
8e2bab5d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  drawtext: remove typo
  pcm-mpeg: implement new audio decoding api
  w32thread: port fixes to pthread_cond_broadcast() from x264.
  doc: add editor configuration section with Vim and Emacs settings
  dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
  avformat/utils: Drop unused goto label.
  doxygen: Replace '\' by '@' in Doxygen markup tags.
  cosmetics: drop some completely pointless parentheses
  cljr: simplify CLJRContext
  drawtext: introduce rand(min, max)
  drawtext: introduce explicit draw/hide variable
  rtmp: Use nb_invokes for all invoke commands

Conflicts:
	libavcodec/mpegvideo.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 00:23:37 +01:00
Mashiat Sarker Shakkhar
c5cd231151 Partially fix CDLMS prediction 2011-12-08 03:57:21 +06:00
Reimar Döffinger
7023fb81c7 One last try to get zmbv test to work across all fate machines. 
Change compression level to 0 this time.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-07 21:46:48 +01:00
Michael Niedermayer
8b85c29463 qtrledec: Fix artifacts in tickets/226/qt_rle_bw.mov 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 21:11:51 +01:00
Alexis Ballier
1af91978db qtrle.c: Fix for ticket #226. 
In 1bpp mode, interpret skip&0x80 as "start a new line" instead of "go to next line", this is almost the same except for the first line which was always skipped before and caused to try to write an extra line at the end of the frame (ticket #226).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 21:11:51 +01:00
Luca Barbato
78212cefe1 drawtext: remove typo 
It slipped through the last two iterations.
 2011-12-07 20:40:18 +01:00
Hendrik Leppkes
bc057f7592 pcm-mpeg: implement new audio decoding api 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-07 13:52:00 -05:00
Ronald S. Bultje
8b03d7fe95 w32thread: port fixes to pthread_cond_broadcast() from x264. 2011-12-07 10:30:54 -08:00
Diego Biurrun
d8538f06e6 doc: add editor configuration section with Vim and Emacs settings 
based on a patch by Victor Vasiliev, vasilvv gmail com
 2011-12-07 18:57:43 +01:00
Rafaël Carré
7efea2a051 dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 16:54:23 +01:00
Michael Niedermayer
0be95fe183 MAINTAINERS: ask maintainers to help keep their entries in this file upto date. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 15:47:19 +01:00
Matthieu Bouron
070a40f1b7 gxfenc: support timecode option 
Reviewed-by: Baptiste Coudurier
 2011-12-07 15:29:26 +01:00
Diego Biurrun
c7e8187d9d avformat/utils: Drop unused goto label. 
libavformat/utils.c:2165:2: warning: label ‘fail’ defined but not used
 2011-12-07 15:29:14 +01:00
Diego Biurrun
ff159e7816 doxygen: Replace '\' by '@' in Doxygen markup tags. 2011-12-07 15:29:14 +01:00
Diego Biurrun
ee41963f19 cosmetics: drop some completely pointless parentheses 2011-12-07 15:29:13 +01:00
Paul B. Mahol
fc9489f6ad cljr: simplify CLJRContext 
There is no need to have delta, offset and gb in CLJRContext.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-07 15:15:02 +01:00
Luca Barbato
f5edfc9e92 drawtext: introduce rand(min, max) 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
73585620b8 drawtext: introduce explicit draw/hide variable 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Carl Eugen Hoyos
a99dbe014d Do not ignore full transparency when writing png palette. 
This reverts r6689, "Make PNG produce correct 8-bit pictures".
 2011-12-07 11:31:27 +01:00
Martin Storsjö
1eef08f98c rtmp: Use nb_invokes for all invoke commands 
704af3e29c broke publishing
of rtmp streams, at least publishing to Wowza servers.

This changes all invoke commands to use nb_invokes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-07 09:01:55 +02:00
Michael Niedermayer
901af94b69 movenc: Always write EDTS when we are able to. 
Inspired by a patch from Michael Root
Idea-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 05:21:37 +01:00
Michael Niedermayer
1fa8ff38e4 Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 04:49:42 +01:00
Michael Niedermayer
76d7d1b0bd img2: 10l typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 03:19:42 +01:00
Carl Eugen Hoyos
c1e2ca1e31 Allow auto-detection of ljpg images. 2011-12-07 02:32:59 +01:00
Michael Niedermayer
ff4800c16b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Code cleanup - mpegvideo.c - 500-1000line
  rv40: NEON optimised weighted prediction
  rv40: NEON optimised chroma MC
  ARM: move NEON H264 chroma mc to a separate file
  rv34: NEON optimised inverse transform functions

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 02:04:00 +01:00
Michael Niedermayer
d9ced9fec6 h264: init prev_frame_num to -1 on init 
Fixes Ticket711

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 00:47:41 +01:00
Michael Niedermayer
6287a356e3 h264: Fix memleaks on close, reset more fields 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 00:47:41 +01:00
Carl Eugen Hoyos
ba3bb53bdc Fix 8BPS RGB32 output, the alpha channel was ignored. 
Reviewed-by: Roberto Togni
 2011-12-06 23:06:27 +01:00
Konstantin Todorov
4d9ec050a2 Code cleanup - mpegvideo.c - 500-1000line 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-06 11:32:38 -08:00
Reimar Döffinger
6ecc78b707 Choose compression level 6 for zmbv test. 
The default of 9 gives different results on different FATE systems.
However the zlib test using compression level 6 works, so
try this instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-06 19:49:33 +01:00
Michael Niedermayer
e1ccc9216b movdec: remove redundant size<=8 check. 
Its checked a few lines below too.
The only difference is that empty atoms with size=0 will now get parsed too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 17:42:10 +01:00
Michael Niedermayer
7d90bc9f2a movdec: Read extended 64bit size before the debug av_log() and only when there 
was enough space to read the 32bit size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 17:35:52 +01:00
Mihnea Balta
fef2da6a22 movdec: Fix bad computed size for atoms with size 0 in MOV files 
The computed size doesn't contain the header size because it's already
skipped by incrementing total_size, but then it's skipped again in the
last line. The atom comes out 8 bytes short and the function
mov_read_chan() aborts the whole parsing process. I think the computed
size should be atom.size - total_size + 8.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 17:31:17 +01:00
Michael Niedermayer
f0d0ae3b1e mov: increase total_size only when it actually increases. 
This is just cosmetic as the if() is always true.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 17:21:05 +01:00
Michael Niedermayer
15130b94fc movenc: support spliting fragments based on bytesize instead of duration. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 16:28:36 +01:00
Michael Niedermayer
cf8ec019ab movenc: fragment support 
Reviewed-by: Baptiste Coudurier
Tested-with-QT: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 16:15:35 +01:00
Michael Niedermayer
c89488588b ffmpeg: Warn if filters poll & request frame behave wrongly. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-06 16:08:29 +01:00
Stefano Sabatini
7ecabc8505 vsrc_life: fix comment in parse_rule() 2011-12-06 15:03:51 +01:00