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
48,200 Commits 37 Branches 400 Tags 463 MiB
928727f951
Commit Graph

48200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomas Härdin
928727f951 mxfdec: Rescale audio stream duration from EditRate to SampleRate 
Since 83cab07 audio stream time bases are based on SampleRate, not EditRate.
This fixes trac ticket #2029 and a few seeking issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:45:34 +01:00
Michael Niedermayer
a752b9b863 ffmpeg: use the new swr -async parameter instead of a set of parameters. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:22:14 +01:00
Michael Niedermayer
f9e55c0fed swr: support -async X as a simple way to do what ffmpeg -async X did 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:21:09 +01:00
Michael Niedermayer
0b980e57ac Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: fix greenish line on the right edge with some xv sizes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 16:36:57 +01:00
Hendrik Leppkes
8b6b3632fe vf_pp: add postproc to the library dependencys for avfilter when enabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 15:49:27 +01:00
Marton Balint
cf0c63d99a ffplay: fix greenish line on the right edge with some xv sizes 
If the XV image linesize was different from the width, SDL would create an
overlay wider than the actually requested one. This causes a greenish line on
the right, because the rightmost texel is blended with unset data.  This patch
introduces a function which duplicates the rightmost texel to the unset space,
that way the blending will be done with duplicated border texels.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-12-25 13:54:07 +01:00
Michael Niedermayer
1be8d0fbda srt_probe: make buffer pointer const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 02:57:48 +01:00
Michael Niedermayer
9cb887ed37 dsputil_mmx: fix pointer type for emulated_edge_mc_func() 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 02:04:31 +01:00
Michael Niedermayer
f89f3d4a98 str_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:55:22 +01:00
Michael Niedermayer
28b9099ac1 pva_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:41 +01:00
Michael Niedermayer
59693ed96c mxf_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:20 +01:00
Michael Niedermayer
c8e5efb496 mpc8_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:59 +01:00
Michael Niedermayer
7a84664ffe mp3_read_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:32 +01:00
Michael Niedermayer
9d95deef61 microdvd_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:58 +01:00
Michael Niedermayer
c3cb338955 mpegps_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:14 +01:00
Michael Niedermayer
e1f9432644 loas_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:56 +01:00
Michael Niedermayer
29397c99e0 lmlm4_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:43 +01:00
Michael Niedermayer
23348647b2 ipmovie_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:44:59 +01:00
Michael Niedermayer
4fcf6aa7a3 flac_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:43:14 +01:00
Michael Niedermayer
658bd6db7b ac3_eac3_probe: mark buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:42:23 +01:00
Michael Niedermayer
d7e050b11d adts_aac_probe: mark buffer pointers as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:41:00 +01:00
Michael Niedermayer
ec40d15d82 oggdec: fix warning: assignment discards qualifiers from pointer target type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 22:37:24 +01:00
Michael Niedermayer
bd16f0a331 avfiltergraph: put variables used in #if 0 code themselfs under #if 0 
Fixes unused variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 22:35:27 +01:00
Michael Niedermayer
70d5cd103a mcdec: suppress "warning: a/vst may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:31:37 +01:00
Michael Niedermayer
e9c4f36c52 lavf/mpeg: suppress warning: lpcm_header_len may be used uninitialized in this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:18:03 +01:00
Michael Niedermayer
7681b8e9a9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wnv1: cosmetics, reformat
  xan: remove a trivially true if().
  ansi: do not depend on get_buffer() initializing the frame.
  zerocodec: remove an unused variable.
  zmbv: remove some pointless comments and empty lines

Conflicts:
	libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 16:20:07 +01:00
Michael Niedermayer
9dbedf331e Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b' 
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
	libavcodec/bmp.c
	tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:48:02 +01:00
Michael Niedermayer
ba8e909c82 Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00' 
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
  hlsenc: Allocate enough space for the pattern string
  lavc: Correct the description of pkt_dts
  avfilter: Compile FIFO filters unconditionally

Conflicts:
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:29:15 +01:00
Michael Niedermayer
d69238e991 Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:09:58 +01:00
Michael Niedermayer
c6664242e0 Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10' 
* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 14:43:03 +01:00
Anton Khirnov
0a9132b84c wnv1: cosmetics, reformat 2012-12-24 09:18:19 +01:00
Anton Khirnov
51648da4dc xan: remove a trivially true if(). 
This function used to be shared with the xxan decoder, but that is not
true anymore.
 2012-12-24 09:17:57 +01:00
Anton Khirnov
99e36ddd3e ansi: do not depend on get_buffer() initializing the frame. 
The background changes from 128 (used by the default/cmdutils
get_buffer()) to 0. This looks more correct.
 2012-12-24 09:17:45 +01:00
Anton Khirnov
261f0b14ed zerocodec: remove an unused variable. 2012-12-24 09:17:40 +01:00
Anton Khirnov
8adfacff5c zmbv: remove some pointless comments and empty lines 2012-12-24 09:17:34 +01:00
Anton Khirnov
c6303f8d70 yop: simplify/sanitize the decoding loop 
Do not overwrite linesize set by get_buffer().

The last frame in the FATE test is not decoded anymore, since the file
is cut and a part of it is missing.
 2012-12-24 09:16:51 +01:00
Anton Khirnov
f6e395e132 c93: set palette_has_changed. 2012-12-24 09:16:11 +01:00
Anton Khirnov
3eab600752 bmp: cosmetics, reformat 2012-12-24 09:15:30 +01:00
Michael Niedermayer
98b7a50a21 tiffdec: Fix runend handling 
Fixes Ticket1999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 04:35:12 +01:00
Michael Niedermayer
d4d8d4f786 rl2: return EOF on EOF 
Fixes Ticket1947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 02:51:51 +01:00
Michael Niedermayer
eeb111d364 Changelog: reword H264-MT entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 01:57:45 +01:00
Stefano Sabatini
86c6bf040b doc/filters: remove outdated comments 
Audio API should not be considered unstable any longer, and mentioning
VHOOK is confusing, as it was removed 4 years ago.
 2012-12-24 01:36:21 +01:00
Clément Bœsch
98dc25672f lavc/pthread: do not re-define _GNU_SOURCE if already defined. 
This fixes the following warning with GCC:
    libavcodec/pthread.c:35:0: warning: _GNU_SOURCE redefined [enabled by default]
    <command-line>::0: note: this is the location of the previous definition

The reason of the presence of this flag is:
    % pkg-config --cflags sdl
    -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL
 2012-12-24 00:54:06 +01:00
Clément Bœsch
00ebac6dfd doc: stop generating syntax.html. 
Just like doc/eval.texi, this file is meant to be included from
ffmpeg-utils.texi, and not to be used as a standalone documentation.
 2012-12-24 00:53:55 +01:00
Martin Storsjö
4a9f7d2bf9 hlsenc: Don't duplicate a string constant 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:48 +02:00
Stefano Sabatini
3193b13aa1 hlsenc: Allocate enough space for the pattern string 
If s->filename doesn't contain any period/filename extension to strip
away, the buffer will be too small to fit both strings. This isn't
any buffer overflow since the concatenation uses av_strlcat with
the right buffer size.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:45 +02:00
Paul B Mahol
4f5440adc2 NIST SPHERE demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-23 21:22:43 +00:00
Paul B Mahol
98fed176cf alsdec: improve warning message when invalid channel position is found 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-23 21:17:44 +00:00
Clément Bœsch
57e99ea44d doc/ffserver: fix a few typo. 2012-12-23 20:25:28 +01:00
Martin Storsjö
0940580adb lavc: Correct the description of pkt_dts 
The description as updated in 6e5c44b0f made it sound like it is
handled exactly like the pts, which it is not. Clarify that it
is the packet that triggered returning the frame instead of just
the last avpacket (in case of frame threading, it won't be the
dts of the last packet).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-23 20:52:21 +02:00