virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
48,777 Commits 39 Branches 425 Tags
868ac91c8dbe1df8efa17a141fad0b02a144a7d6
Commit Graph
48777 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol 868ac91c8d frmdec: do not abuse ff_codec_get_id() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-12 14:39:13 +00:00
Michael Niedermayer db1ba2213f lavf: use avpriv_find_pix_fmt instead of ff_ 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 14:09:08 +01:00
Michael Niedermayer 43d6ac53f2 lavc: ff_find_pix_fmt ->avpriv 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 14:06:30 +01:00
Michael Niedermayer dae382b5b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
  pixfmt: add picture format for VDPAU

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:42:42 +01:00
Michael Niedermayer 15daa8f9dd Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6' 
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:32:13 +01:00
Michael Niedermayer e730c3a2cb Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1' 
* commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:14:05 +01:00
Michael Niedermayer dda2d29748 Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457' 
* commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:00:50 +01:00
Diego Biurrun f89466ad6f Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU. 
Also fix a lavu version typo in APIchanges.
 2013-01-12 12:28:12 +01:00
Luca BarbatoandDiego Biurrun f61272f0ef ratecontrol: K&R cosmetic formatting 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-12 12:00:49 +01:00
Rémi Denis-CourmontandDiego Biurrun 169fb94f0f pixfmt: add picture format for VDPAU 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-12 12:00:49 +01:00
Stefano Sabatini 4a0d1b2159 doc/protocols: improve wording of a sentence in http docs 
Suggested-By: Alexander Strasser
 2013-01-12 11:02:12 +01:00
Stefano Sabatini 0edb440282 doc/ffserver: remove painfully outdated "What do I need?" section 2013-01-12 10:53:22 +01:00
Stefano Sabatini df018207f9 doc/ffserver: remove paragraph in the introductory blurb 
The paragraph is about what ffserver is not and where to look for other
information, but is pretty redundant and distracting, especially
considering the new organization of the documentation.
 2013-01-12 10:52:32 +01:00
Stefano Sabatini cab85051c0 doc/ffserver: rework introducing paragraphs of the "description" chapter 
In particular, add some markup, fix empty line, and merge it with "How
does it work?" section.
 2013-01-12 10:49:11 +01:00
Stefano Sabatini 0a7cd74043 doc/protocols: document http protocol options 2013-01-12 10:41:56 +01:00
Stefano Sabatini 255ec768da lavf/http: fix/extend option descriptions 
In particular, favor predicative form over nominal description of the set
parameter. This is more globally consistent.
 2013-01-12 10:41:56 +01:00
Michael Niedermayer d9226b3717 mpegvideo: dont leave stale pointers in next/last picture 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 04:46:08 +01:00
Michael Niedermayer cc548ea7a6 vc1dec: ensure cbpcy_vlc has been set before decoding a frame. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 04:09:21 +01:00
Michael Niedermayer 68329388bb fate: try to fix dirac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 23:44:04 +01:00
Michael Niedermayer b53adef07b h264: reset first_field when current_picture_ptr is reset 
Fixes NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 23:14:51 +01:00
Martin Storsjö f6804c3e1b rtpdec: Remove a useless todo comment 
The question can be answered: No, we do not know the initial sequence
number from the SDP. In certain cases, it can be known from the
RTP-Info response header in RTSP though. (In that case, we use it as
timestamp origin, but not for rtp receiver statistics.)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 00:02:17 +02:00
Martin Storsjö 54cb096ee4 rtsp: Remove an outdated comment 
It is unclear what the bug exactly was and if it ever was fixed,
and we don't even support decoding via faad any longer. The
comment has been present since d0deedcb in 2006.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 00:02:11 +02:00
Martin Storsjö 3900d53fb1 rtsp: Remove references to weirdly named variables in other files 
One of them is renamed now, but mentioning it by name serves
no purpose here.  The other table mentioned ceased to exist
under that name in 4934884a1 in 2006.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 00:02:04 +02:00
Martin Storsjö c44784c9bb rtp: Rename a static variable to normal naming conventions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 00:01:51 +02:00
Martin Storsjö 58b5971881 rtp: Cosmetic cleanup 
Remove leftover debug comments, fix brace placement and
add whitespace, remove unnecessary and weirdly placed braces.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 00:01:28 +02:00
Clément Bœsch f8bab2f87e fate: add dirac decoding test (main profile). 2013-01-11 19:46:48 +01:00
Michael Niedermayer 969e75eb80 mjpegdec: Fix out of array read in unescaping code 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 18:20:25 +01:00
Michael Niedermayer e5e422bcc3 mxfdec: Fix integer overflow with many channels 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 17:42:04 +01:00
Michael Niedermayer 8d06be6b8c wavpack: check pointer to avoid overreading input buffer 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 16:37:31 +01:00
Michael Niedermayer 85a4dbeb9c ra144enc: fix two "may be used uninitialized in this function" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 15:43:46 +01:00
Michael Niedermayer 2e230cf1b5 au: switch to ff_pcm_read_packet() again, after the merge 
This fixes G722 durations

Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 15:18:58 +01:00
Michael Niedermayer f137d5763d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 13:38:37 +01:00
Michael Niedermayer 6fc0648932 Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e' 
* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 13:01:07 +01:00
Michael Niedermayer 8bfc8d88be Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30' 
* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
	tests/fate/demux.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 12:30:32 +01:00
Paul B Mahol 3ac85bebd5 lavf: remove nonexistent symbols 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-11 10:07:52 +00:00
Marcin JuszkiewiczandMartin Storsjö d11cb13b0e configure: enable pic for shared libs on AArch64 
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-11 11:01:05 +02:00
Luca Barbato c1d1ef4ecd zmbv: Reset the decoder on keyframe errors 
Prevent the crash on fuzzed files as reported in bug 63.
 2013-01-11 05:07:42 +01:00
Vladimir PantelicandLuca Barbato 7b8c5b263b vc1dec: prevent a crash due missing pred_flag parameter 
Handle pred_flag parameter not given to get_mvdata_interlaced()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-11 04:57:41 +01:00
Michael Niedermayer 23318a5735 error_concealment: Check that the picture is not in a half setup state. 
Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 04:46:49 +01:00
Michael Niedermayer 8b47058c61 ass_split: fix out of array access in ass_split() 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 02:51:54 +01:00
Michael Niedermayer 97b1ba696b ass_split: fix out of array access 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 02:31:31 +01:00
Michael Niedermayer 2c16bf2de0 vorbisdec: Check bark_map_size. 
This fixes potential divisions by zero and out of array accesses.

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-11 00:58:40 +01:00
Dale CurtisandLuca Barbato ae3d416369 matroska: Fix use after free 
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-11 00:12:08 +01:00
Nicolas George 7e5c5fa5fc lavfi/vf_overlay: check that filter_frame does not return EAGAIN. 
EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.

Should fix CID966655.
 2013-01-10 21:55:02 +01:00
Michael Niedermayer a74548521b swr: check that allocation of in/out_convert succeeded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 20:27:07 +01:00
Ronald BultjeandLuca Barbato ec86ba5731 vp3: Fix double free in vp3_decode_end() 
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-10 20:05:42 +01:00
Michael Niedermayer e5a736261b swr: Use a temporary buffer for dither/Noise shaping when the input is read only 
This avoids copying the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:51:30 +01:00
Michael Niedermayer 2eec98125e swr: mark noise data for noise shaping as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:07:32 +01:00
Michael Niedermayer 558aa6cab7 swr: add seperate in/out pointers to the noise shaping code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:06:19 +01:00
Michael Niedermayer fca51256d4 swr: rename dither_pos to noise_pos 
THis more closely matches what the field represents

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:01:26 +01:00