virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
54,976 Commits 37 Branches 400 Tags 460 MiB
5efa5103b0
Commit Graph

54976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
5efa5103b0 sgidec: simplify return path 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:00:25 +00:00
Michael Niedermayer
e8023dbaf0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 09:43:29 +02:00
Michael Niedermayer
9027928522 Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253' 
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 09:19:58 +02:00
Michael Niedermayer
e64dc86a13 Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a' 
* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
  AIX: add support for shared builds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 09:13:07 +02:00
Michael Niedermayer
103b8d876a Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d' 
* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
  avio: Don't set the seekable flag if no seek function is provided

See: 650355089c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 09:06:21 +02:00
Michael Niedermayer
5cb3d35dcc Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5' 
* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
  rtpenc: Fix some odd comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 08:58:26 +02:00
Michael Niedermayer
2fffc05f42 Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7' 
* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
	libavfilter/buffersink.c

See: af2a196e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 08:53:09 +02:00
Michael Niedermayer
8720d3ac21 avfilter/vf_scale: set in_color_matrix default to "auto" 2013-07-27 01:16:07 +02:00
Michael Niedermayer
8efe96ee6f swscale/fill_rgb2yuv_table: fix default detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 01:11:37 +02:00
Michael Niedermayer
f3f4e133d6 avfilter/vf_scale: use sws_getCoefficients() 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 23:07:19 +02:00
Michael Niedermayer
205f423e28 libavcodec/mpegvideo: change some asserts to av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb avcodec/mpegvideo: replace assert about interlaced EC by debug av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 22:29:47 +02:00
Martin Storsjö
979e9e8f36 wtv: Drop some casts that now are unnecessary 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 23:05:18 +03:00
Martin Storsjö
86f042dcab wtv: Make WTV_SECTOR_BITS a 64 bit constant 
This makes sure that values that are left-shifted by this constant
end up casted to 64 bit before shifting, avoiding overflow if the
value ends up larger than 2 GB.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 23:05:14 +03:00
Michael Kostylev
80ade7985c AIX: add support for shared builds 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-26 21:12:36 +02:00
Hendrik Schreiber
b512360184 avio: Don't set the seekable flag if no seek function is provided 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 21:46:18 +03:00
Martin Storsjö
1297f7b87f rtpenc: Fix some odd comments 
Some weird comments stem from the fact that the rtpdec and rtpenc
code was shared earlier.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 21:43:29 +03:00
Paul B Mahol
1fa0284c57 qcelpdec: change asserts to av_asserts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7 sgienc: remove unused SgiContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 18:21:44 +00:00
Paul B Mahol
be7d6710b4 lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 17:16:26 +00:00
Hendrik Leppkes
779e6c2b98 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-26 19:51:04 +03:00
Paul B Mahol
7ac736afbd lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:24:55 +00:00
Paul B Mahol
2634af575c avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:21:25 +00:00
Paul B Mahol
0addc82880 avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:21:21 +00:00
Paul B Mahol
a4b899f588 lavfi/gradfun: remove nv21/nv12 as they are not supported 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 15:07:12 +00:00
Paul B Mahol
2868035d95 pcxenc: get rid of unused PCXContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 14:00:40 +00:00
Paul B Mahol
3838637bbb yop: check return value of av_frame_alloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:51:26 +00:00
Paul B Mahol
9437259276 vmnc: check return values of reallocation 
Also avoid memory leaks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:49:36 +00:00
Paul B Mahol
cf5ab8b6f7 vmnc: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:39:40 +00:00
Hendrik Leppkes
af2a196e66 lavfi: add attribute_align_arg to all public entry points 
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 13:59:30 +02:00
Paul B Mahol
2a1a599bcb lavfi/buffersrc: remove unused item from BufferSourceContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 11:43:43 +00:00
Michael Niedermayer
6663205338 avformat/dtsdec: Improve probe, reject things looking like analoge signals 
Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 11:19:43 +02:00
Michael Niedermayer
46ad2d9e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 11:12:11 +02:00
Michael Niedermayer
5dc2c99055 Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e' 
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:57:51 +02:00
Michael Niedermayer
bbc7d33a0d Merge commit '582963a8156522582e55466be4a59974a8d909a5' 
* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
	libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:51:42 +02:00
Michael Niedermayer
af7949fdea Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3' 
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
	libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:43:12 +02:00
Michael Niedermayer
e28fabb4cb Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625' 
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:30:47 +02:00
Michael Niedermayer
1af921196f Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 22:50:51 +02:00
Paul B Mahol
fd84b6fd33 lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-25 20:41:39 +00:00
Reuben Martin
4a60df2d35 avformat/gxfenc: Added support for writing correct auxiliary data for DV streams. 
Different aux data is written for DVCAM and DVPRO formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 22:01:12 +02:00
Diego Biurrun
03039f4c8c miscellaneous typo fixes 2013-07-25 19:43:32 +02:00
Rémi Denis-Courmont
93a51984a2 mpeg12: Ignore slice threading if hwaccel is active 
Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
9375879d57 Show max bitrate for mpeg2 video streams in avcodec_string(). 
See also 25b7aa9
 2013-07-25 19:08:19 +02:00
Carl Eugen Hoyos
8ca3766f00 Allow native compilation on the iPhone. 2013-07-25 19:08:19 +02:00
Michael Niedermayer
de0a1f63df avfilter/can_merge_formats: fix memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:54:04 +02:00
Michael Niedermayer
6bde1e9d14 avfilter/avfiltergraph: fix check using the wrong variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 16:53:39 +02:00
Rainer Hochecker
582963a815 vdpau: Fix VC-1 interlaced mode 
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-25 14:19:17 +02:00
Diego Biurrun
4a2ef39442 cosmetics: Add '0' to float constants ending in '.'. 2013-07-25 11:33:23 +02:00
Diego Biurrun
6c145ecf78 twinvq: K&R formatting cosmetics 2013-07-25 11:17:06 +02:00
Michael Niedermayer
0815b23062 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

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