ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,304 Commits 36 Branches 398 Tags 535 MiB
b7c6685268
Commit Graph

54304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
b7c6685268 mpegts_read_header: goto fail instead of return directly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 16:23:42 +02:00
Michael Niedermayer
afddf0d910 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
	libavcodec/mjpegdec.c

See: a9456c7c5c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 14:11:38 +02:00
Michael Niedermayer
e3fb8ac956 Merge commit '7520d9779c6d30b385df5a0a42da508238076192' 
* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 13:50:55 +02:00
Michael Niedermayer
06549cee42 Merge commit '7798a59dc14ae27efe64e639a42646002608a908' 
* commit '7798a59dc14ae27efe64e639a42646002608a908':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 13:43:05 +02:00
Michael Niedermayer
c1fc4ff937 Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df' 
* commit '02ec656af72030eea4f3d63e30b25625cce6a3df':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 13:35:36 +02:00
Michael Niedermayer
490ed7f0ec Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a' 
* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
	libavcodec/wmaprodec.c

See: 9166f483c5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 13:21:49 +02:00
Michael Niedermayer
97947d9bba Merge commit '183880cfc4aae53ce504e13337791cad5841c80c' 
* commit '183880cfc4aae53ce504e13337791cad5841c80c':
  pictor: use the correct logging context

No change, as this has already been fixed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 13:04:40 +02:00
Michael Niedermayer
e27be795f0 avcodec/lpc: Use a function pointer from an initialized context 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 12:40:16 +02:00
Michael Niedermayer
32a3955259 Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740' 
* commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740':
  lpc: use levinson for the first pass of multipass cholesky

Conflicts:
	libavcodec/lpc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 12:26:58 +02:00
Michael Niedermayer
6e76e6a05a Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191' 
* commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
  x86: lpc: simd av_evaluate_lls

Conflicts:
	libavutil/x86/lls.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 12:15:12 +02:00
Michael Niedermayer
a285079bc7 lls.asm: disable ff_update_lls_avx 
The code doesnt build with yasm from ubuntu 12.04

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 12:12:11 +02:00
Michael Niedermayer
0b40c50508 lls.asm: put avx code under if HAVE_AVX_EXTERNAL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 12:12:01 +02:00
Michael Niedermayer
78b5479633 Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053' 
* commit '502ab21af0ca68f76d6112722c46d2f35c004053':
  x86: lpc: simd av_update_lls

The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
 commits)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 11:35:52 +02:00
Michael Niedermayer
c93a424718 Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2' 
* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
  lpc: use function pointers, in preparation for asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 11:23:43 +02:00
Michael Niedermayer
d3bd320e63 Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b' 
* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 10:54:20 +02:00
Luca Barbato
6765ee7b9c mjpeg: Check the unescaped size for overflows 
And contextually check init_get_bits success and fix the reporting
message.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-30 08:48:51 +02:00
Luca Barbato
7520d9779c mjpeg: Move code out of else branch 
Simplify the control flow and spare some vertical space.
 2013-06-30 08:46:55 +02:00
Michael Niedermayer
ff130d7363 get_xbits: assert validity of the number of bits 
similar is already done in the other get_bits() functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 01:40:18 +02:00
Michael Niedermayer
68efb1d60a 4xm: Dont ignore dc run errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 01:35:22 +02:00
Michael Niedermayer
13c56e9a9c 4xm: check for invalid zero ac coeffs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 01:35:22 +02:00
Michael Niedermayer
6d6eabd399 mjpeg_decode_dc: check code before using it in get_xbits() 
Fixes undefined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 01:35:22 +02:00
Derek Buitenhuis
58950ca0df ffmpeg: Don't include colorspace.h 
The header is private, and ffmpeg.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-29 16:44:12 -04:00
Michael Niedermayer
a2802d3cd4 get_pix_fmt_score: favor equal formats if all else equal 
Fixes Ticket2578

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 22:20:20 +02:00
Derek Buitenhuis
7798a59dc1 avconv: Don't include colorspace.h 
The header is private, and avconv.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-29 14:24:02 -04:00
Michael Niedermayer
7f866c14ba update all trac links to use the trac subdomain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 19:27:49 +02:00
Michael Niedermayer
a2e50fa068 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 19:16:49 +02:00
Luca Barbato
02ec656af7 wmapro: error out on impossible scale factor offsets 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-29 18:11:59 +02:00
Luca Barbato
d4a217a408 wmapro: check the min_samples_per_subframe 
Must be at least WMAPRO_BLOCK_MIN_SIZE.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-29 18:11:40 +02:00
Luca Barbato
183880cfc4 pictor: use the correct logging context 
Broken in 6d97484d72
 2013-06-29 18:11:12 +02:00
Reuben Martin
2fa89b2736 Added codec ID to playback DNxHD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 18:02:37 +02:00
Carl Eugen Hoyos
225f78b7ef Avoid a null pointer dereference on clean-up after oom in ac3 encoder. 2013-06-29 17:50:07 +02:00
Carl Eugen Hoyos
90bd75e6eb Avoid a null pointer dereference on oom when decoding smacker. 
Fixes ticket #2728.
 2013-06-29 16:04:07 +02:00
Carl Eugen Hoyos
a1dbe49d02 Propagate error return values from the smacker decoder. 2013-06-29 16:02:43 +02:00
Carl Eugen Hoyos
ac83d62136 Avoid a null pointer dereference on oom when decoding vc1. 
Fixes ticket #2723.
 2013-06-29 14:49:47 +02:00
Stefano Sabatini
d47168e729 doc/muxers: apply various minor fixes to segment documentation 2013-06-29 14:12:11 +02:00
Stefano Sabatini
f150db096d doc/muxers: sort muxers by name 2013-06-29 14:12:11 +02:00
Loren Merritt
c93ccf5a4c lpc: use levinson for the first pass of multipass cholesky 
Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-29 13:26:52 +02:00
Loren Merritt
b545179fdf x86: lpc: simd av_evaluate_lls 
1.5x-1.8x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-29 13:23:57 +02:00
Loren Merritt
502ab21af0 x86: lpc: simd av_update_lls 
4x-6x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-29 13:23:57 +02:00
Loren Merritt
41578f70cf lpc: use function pointers, in preparation for asm 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-29 13:23:57 +02:00
Loren Merritt
cc6714bb16 lpc: remove "decay" argument 
We never used the rolling-average mode, and this makes av_update_lls 15% faster.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-29 13:23:57 +02:00
Michael Niedermayer
a3e9f4c32a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wmapro: check num_vec_coeffs against the actual available buffer

Conflicts:
	libavcodec/wmaprodec.c

The check is replaced by an assert.

See: b21ba20cc8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 12:23:56 +02:00
Michael Niedermayer
562e8d019b Merge commit '6652338f43ef623045912d7f28b61adea05d27ae' 
* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 11:47:26 +02:00
Michael Niedermayer
3e33db3f65 Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea' 
* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
  wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 11:37:09 +02:00
Michael Niedermayer
c1343897c3 Merge commit 'afe03092dd693d025d43e1620283d8d285c92772' 
* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 10:59:04 +02:00
Michael Niedermayer
53fd1ab26b avformat: make av_register_*put_format() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:46:10 +02:00
Michael Niedermayer
b36b5edb8f avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:39:03 +02:00
Michael Niedermayer
08f6fdc3e4 avcodec/parser: Make av_register_codec_parser() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:32:57 +02:00
Michael Niedermayer
8738d94274 avcodec: Make av_register_hwaccel() and avcodec_register() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:28:58 +02:00
Timothy Gu
a9bbf59be7 cosmetics: Fix "dont" "wont" "doesnt" typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 02:31:16 +02:00