virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
57,167 Commits 37 Branches 400 Tags 465 MiB
c8dd048ab8
Commit Graph

57167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjö
e6ed866859 flvenc: Write proper cropping for VP6 even if there's no extradata 
This keeps cropping when remuxing from F4V to FLV.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-10 10:42:28 +03:00
Martin Storsjö
be1e1373d2 flvenc: Support muxing VP6A as well 
Handle it in the same way as VP6F, except for the codec tag.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-10 10:42:10 +03:00
Martin Storsjö
4d7aeff9a1 flvenc: Don't pretend to support muxing "plain" VP6 
The plain VP6 format is vertically flipped compared to VP6F/VP6A.
Support for the plain VP6 format was added in 09d8c0ae83 (which
also introduced support for muxing VP6F properly in general).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-10 10:41:44 +03:00
Martin Storsjö
41a10f3ba1 vp6: Support cropping to AVCodecContext.width/height 
In these cases, there is no extradata but only the properly set
width/height values by the demuxer.

This makes sure VP6 in F4V files is cropped properly.

This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f515091.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-10 10:41:21 +03:00
Michael Niedermayer
20669753ce Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4' 
* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
  vmnc: Check the cursor dimensions

Conflicts:
	libavcodec/vmnc.c

See: 9437259276
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 09:39:07 +02:00
Michael Niedermayer
f18db82f29 Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707' 
* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
  vmnc: Port to bytestream2

Conflicts:
	libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 09:19:05 +02:00
Michael Niedermayer
7824b5f6f5 Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9' 
* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
	libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 09:04:22 +02:00
Luca Barbato
ceec6e792e avi: directly resync on DV in AVI read failure 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-10 07:28:17 +02:00
Luca Barbato
756547ce7f avi: DV in AVI must be considered single stream 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-10 07:28:03 +02:00
Luca Barbato
1cac9accbd avi: properly fail if the dv demuxer is missing 
CC: libav-stable@libav.org
 2013-10-10 07:27:50 +02:00
Michael Niedermayer
65c2fe7159 avcodec/h264: call flush_change() on init 
This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.

Fixes Ticket2738

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 02:25:51 +02:00
Michael Niedermayer
5ac6b6028f avcodec/h264_refs: modify key frame detection heuristic to detect more cases 
Fixes Ticket2968

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 00:07:26 +02:00
Luca Barbato
1018a92219 jpeg2000: Check block length 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-09 22:25:19 +02:00
Luca Barbato
071e29af4d vmnc: Use meaningful return values 2013-10-09 22:25:01 +02:00
Luca Barbato
5e992a4682 vmnc: Check the cursor dimensions 
And manage the reallocation failure path.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-09 22:25:01 +02:00
Luca Barbato
61cd19b8bc vmnc: Port to bytestream2 
Fix some buffer overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-09 22:25:01 +02:00
Luca Barbato
a66aa0daf2 vmnc: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-09 22:25:01 +02:00
Michael Niedermayer
83fc6c822b avformat/wavdec: Dont trust the fact chunk for PCM 
Fixes Ticket3033

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 22:18:19 +02:00
Carl Eugen Hoyos
3aa576513b lavd/xv.c: Include XShm.h before Xvlib.h. 
This may fix compilation with libxv 1.0.4.
 2013-10-09 19:01:11 +02:00
Michael Niedermayer
0f322feffd avfilter/buffersink: try to fix AV_NOPTS_VALUE 
no testcase available, just found this issue by reading the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Michael Niedermayer
8780f7fbfa avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE 
Fixes Ticket3015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Paul B Mahol
8c7bc7d3e5 avcodec/exr: use avpriv_report_missing_feature() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-09 13:46:44 +00:00
Paul B Mahol
19fda0a1bc avcodec/vmnc: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-09 12:54:45 +00:00
Michael Niedermayer
31d0d35560 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
	libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 14:29:42 +02:00
Michael Niedermayer
4ce82e6fa9 Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1' 
* commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1':
  build: Require yasm 0.8.0 or higher

Conflicts:
	configure

If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 14:17:56 +02:00
Henrik Gramner
ad7d7d4f6a x86inc: Remove .rodata kludges 
The Mach-O bug was fixed in yasm 0.8.0 and we don't
support versions that old anymore.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-09 07:44:30 -04:00
Derek Buitenhuis
9e3946aada build: Require yasm 0.8.0 or higher 
This is in preparation for removing a .rodata kludge
which was only required for older YASM versions.

The movbe instruction was introduced in 0.8.0, which already
had AVX, which was introduced in 0.7.0, and NASM introduced
movbe in 2.0.3, which is the same version which introduced
AVX support.

Also, make the failure message more accurate.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-09 07:44:19 -04:00
Clément Bœsch
56db86a0b2 doc/filters: remove extra spacing in vid.stab section. 2013-10-09 13:22:04 +02:00
Michael Niedermayer
7f22df3a49 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  shorten: Extend fixed_coeffs to properly support pred_order 0

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 11:04:06 +02:00
Carl Eugen Hoyos
3aabfaa37b Fix make checkheaders for vp9 header files. 2013-10-09 09:42:16 +02:00
Carl Eugen Hoyos
f4e85afd99 Add pulse_audio_common.h to skipheaders. 
Fixes an error when running make checkheaders.
 2013-10-09 09:39:57 +02:00
Lou Logan
f115e83c81 MAINTAINERS: add Communication section 
Add Twitter with myself (Lou Logan) as maintainer.

Add Google+ with Paul B Mahol, Michael Niedermayer, and Alexander
Strasser as maintainers.

Move website and mailinglists from Miscellaneous Areas to
Communication.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 04:04:38 +02:00
Timothy Gu
df08fd5e1e doc/default.css + doc/t2h.init: New styles 
The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 04:01:46 +02:00
Luca Barbato
b2148faca9 shorten: Extend fixed_coeffs to properly support pred_order 0 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-09 03:34:10 +02:00
Michael Niedermayer
885739f3b4 ffserver: strip odd chars from html error messages before sending them back 
Fixes Ticket3034

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 00:30:46 +02:00
Lukasz Marek
60136345e6 lavd/pulse: move common code to separate file 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 23:02:47 +02:00
Lukasz Marek
1ab9f322ee lavd/pulse: rename pulse.c into pulse_audio_dec.c 
This make name of the file more specific
as there is also encoder implementation.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 22:28:39 +02:00
Paul B Mahol
162e22e144 avfilter/af_join: remove now unnecessary goto 
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-08 12:40:33 +00:00
Paul B Mahol
85b56e4803 avcodec/xwddec: use avpriv_report_missing_feature 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-08 12:40:33 +00:00
Paul B Mahol
3abbf20962 dpx: abgr support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-08 12:40:33 +00:00
Lukasz Marek
361b56c379 lavd: pulse audio encoder 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 14:31:50 +02:00
Michael Niedermayer
8c0f565ee3 avformat/movenc: factor out find_fps() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 14:18:43 +02:00
Michael Niedermayer
2dce4abe50 Changelog: add max_error_rate 
Suggested-by: Paul B Mahol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 13:38:59 +02:00
Ronald S. Bultje
ad75d2b590 x86: Fix compilation with nasm on PPC & OS/2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 12:36:19 +02:00
Michael Niedermayer
deb5addcff Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: h264_idct: Update comments to match 8/10-bit depth optimization split

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 12:10:02 +02:00
Michael Niedermayer
19c3890819 Merge commit '3e2fa991db7ef172579422accd61624d52777e5a' 
* commit '3e2fa991db7ef172579422accd61624d52777e5a':
  x86inc: remove misaligned cpu flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 12:02:21 +02:00
Michael Niedermayer
31d9aa6b2e Merge commit '71155665414b551ad350622d5abed20e58371fbf' 
* commit '71155665414b551ad350622d5abed20e58371fbf':
  x86inc: various minor backports from x264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 11:57:39 +02:00
Michael Niedermayer
3f965ab95d Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97' 
* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
  x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 11:37:22 +02:00
Michael Niedermayer
1f17619fe4 Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450' 
* commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450':
  x86inc: Utilize the shadow space on 64-bit Windows

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 11:23:00 +02:00
Michael Niedermayer
17d9c7c208 Merge commit '3fb78e99a04d0ed8db834d813d933eb86c37142a' 
* commit '3fb78e99a04d0ed8db834d813d933eb86c37142a':
  x86inc: create xm# and ym#, analagous to m#

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 11:15:17 +02:00