virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity
38,320 Commits 37 Branches 400 Tags
Commit Graph

17912 Commits

Author SHA1 Message Date
Michael Niedermayer
8c1ebdcea2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  shorten: Use separate pointers for the allocated memory for decoded samples.
  atrac3: Fix crash in tonal component decoding.
  ws_snd1: Fix wrong samples counts.
  movenc: Don't set a default sample duration when creating ismv
  rtp: Factorize the check for distinguishing RTCP packets from RTP
  golomb: avoid infinite loop on all-zero input (or end of buffer).
  bethsoftvid: synchronize video timestamps with audio sample rate
  bethsoftvid: add audio stream only after getting the first audio packet
  bethsoftvid: Set video packet duration instead of accumulating pts.
  bethsoftvid: set packet key frame flag for audio and I-frame video packets.
  bethsoftvid: fix read_packet() return codes.
  bethsoftvid: pass palette in side data instead of in a separate packet.
  sdp: Ignore RTCP packets when autodetecting RTP streams
  proresenc: initialise 'sign' variable
  mpegaudio: replace memcpy by SIMD code
  vc1: prevent using last_frame as a reference for I/P first frame.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/golomb.h
	libavcodec/shorten.c
	libavcodec/ws-snd1.c
	tests/ref/fate/bethsoft-vid

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-17 00:35:06 +01:00
Michael Niedermayer
22b125f912 g729dec: fix 'warning: assignment from incompatible pointer type' 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 23:25:51 +01:00
Michael Niedermayer
934abf6ff8 g729dec: fix use of deprecated functions. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 23:02:07 +01:00
Michael Niedermayer
ad21c05172 diracdec: fix use of deprecated funnctions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 23:01:47 +01:00
Michael Niedermayer
204cb29b3c shorten: Use separate pointers for the allocated memory for decoded samples. 
Fixes invalid free() if any of the buffers are not allocated due to either
not decoding a header or an error prior to allocating all buffers.

Fixes CVE-2012-0858
CC: libav-stable@libav.org

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-16 15:18:45 -05:00
Michael Niedermayer
c509f4f747 atrac3: Fix crash in tonal component decoding. 
Add a check to avoid writing past the end of the channel_unit.components[]
array.

Bug Found by: cosminamironesei
Fixes CVE-2012-0853
CC: libav-stable@libav.org

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-16 15:18:45 -05:00
Michael Niedermayer
9fb7a5af97 ws_snd1: Fix wrong samples counts. 
This makes the check that avoids overwrite of the samples array actually
work properly.

fixes CVE-2012-0848
CC: libav-stable@libav.org

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-16 15:18:45 -05:00
Michael Niedermayer
8b18288c08 qtrleenc: fix uninitialized variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 20:11:33 +01:00
Michael Niedermayer
5a03a3d998 proresdec2: use ff_dsputil_init() avoid deprecated ff_ less variant. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 19:55:16 +01:00
Michael Niedermayer
67f17e7202 proresdec2: Fix 16 vs. 8bit compiler warnings. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 19:54:28 +01:00
Ronald S. Bultje
c6643fddba golomb: avoid infinite loop on all-zero input (or end of buffer). 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-16 08:36:08 -08:00
Justin Ruggles
f320fb894c bethsoftvid: pass palette in side data instead of in a separate packet. 
Update FATE reference to account for now non-existent palette packet.
This also fixes the FATE test if frame data is not initialized in
get_buffer(), so update comment in avconv accordingly.
 2012-02-16 10:47:11 -05:00
Benjamin Larsson
7f215e3e72 Use fixed-length array in revert_mclms() 2012-02-16 20:14:18 +06:00
Kostya Shishkov
17b11ffec7 proresenc: initialise 'sign' variable 2012-02-16 06:48:24 +01:00
Michael Niedermayer
b92ecda2c9 snow: zero scratchbuf. 
This should fix some valgrind warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 06:25:32 +01:00
Michael Niedermayer
0f155c8601 fate: trying to fix "libavcodec/dct-test.o:(.rodata+0xdc): undefined reference to fdct_altivec" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 06:15:40 +01:00
Christophe GISQUET
f3e084909b mpegaudio: replace memcpy by SIMD code 
By replacing memcpy with an unrolled loop using the alignment knowledge
it has, some speedup can be obtained.

Before (gcc 4.6.1): ~400 cycles
After: ~370 cycles

Overall, around 2% speed increase when decoding a 2400s mp3 to f32le.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-02-15 20:11:54 -08:00
Ronald S. Bultje
ae591aeea5 vc1: prevent using last_frame as a reference for I/P first frame. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-15 19:58:10 -08:00
Michael Niedermayer
28ba1027ec Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Do not try to read residue if ave_mean <= 1
  Move some variable declarations to comply with C90
  Cosmetics: fix some whitespace errors
  Support 24-bit decoding
  wmall: remove ;;

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 04:01:24 +01:00
Pilotware
7606825350 Handle interlaced formats (two coding units together make one full frame) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 03:05:22 +01:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Michael Niedermayer
8812c97b98 proresenc: Rename for incoming NIH-syndrom. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 00:37:17 +01:00
Mashiat Sarker Shakkhar
d1ea26f640 Do not try to read residue if ave_mean <= 1 
Otherwise, we end up with with log(0) or log(1). av_ceil_log2 simply
assumes the argument is non-zero and returns wrong result when it is.
(Not that there is a proper way of returning an undefined value.)
 2012-02-16 02:39:30 +06:00
Mashiat Sarker Shakkhar
59df25effd Move some variable declarations to comply with C90 2012-02-16 02:34:31 +06:00
Mashiat Sarker Shakkhar
3ce50bf51d Cosmetics: fix some whitespace errors 2012-02-16 02:33:30 +06:00
Mashiat Sarker Shakkhar
6345184fc9 Support 24-bit decoding 2012-02-16 02:25:45 +06:00
Michael Niedermayer
dc08e7ea0f wmall: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 02:21:35 +06:00
Martin Storsjö
210f72845c ppc: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:29 +02:00
Martin Storsjö
f73673a770 sh4: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:26 +02:00
Martin Storsjö
efd29844eb mpegvideo: Add ff_ prefix to nonstatic functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:23 +02:00
Martin Storsjö
0ca1bdb37d rtjpeg: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:20 +02:00
Martin Storsjö
6c28d65754 rv: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:17 +02:00
Martin Storsjö
d1b357d78b vp56: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:14 +02:00
Martin Storsjö
27cfdc3e4f vorbis: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:11 +02:00
Martin Storsjö
04d3822524 msmpeg4: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:08 +02:00
Martin Storsjö
5f2c159c0f vc1: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:05 +02:00
Martin Storsjö
1fec055066 msmpeg4: Add ff_ prefixes to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:01 +02:00
Martin Storsjö
35e02a3d0e snow: Add ff_ prefix to nonstatic symbols 
This allows getting rid of a hack for conflicting symbol/define
names.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:58 +02:00
Martin Storsjö
d6c8dcb8ac mpeg12: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:56 +02:00
Martin Storsjö
6f13a371ec mpeg4: Add ff_ prefixes to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:52 +02:00
Martin Storsjö
e9ca85e714 lagarith: Add ff_ prefix to lag_rac_init 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:49 +02:00
Martin Storsjö
c8e1b2fbc9 libavcodec: Add ff_ prefix to j_rev_dct* 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:46 +02:00
Martin Storsjö
873c89e2a6 dsputil: Add ff_ prefix to inv_zigzag_direct16 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:42 +02:00
Martin Storsjö
3e2efacdd8 libavcodec: Prefix fdct_ifast, fdct_ifast248 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:38 +02:00
Martin Storsjö
9cf0841ef3 dsputil: Add ff_ prefix to the dsputil*_init* functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:34 +02:00
Martin Storsjö
99560a4caa libavcodec: Add ff_ prefix to some nonstatic symbols 
Prefix the functions atrac_generate_tables, atrac_iqmf, dct_quantize_c.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:29 +02:00
Martin Storsjö
e96b4a53df vlc/rl: Add ff_ prefix to the nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:26 +02:00
Martin Storsjö
ddce8953a5 h263: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:22 +02:00
Martin Storsjö
a082ac4125 mpegvideo: Remove a leftover function declaration 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:12 +02:00
Michael Niedermayer
25893ad6c9 ffv1: Warn the user if transparency is stored. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-15 20:35:14 +01:00