virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
34,955 Commits 37 Branches 400 Tags 460 MiB
7c92c03b8d
Commit Graph

34955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Bradshaw
7c92c03b8d Added support for J2K encoding with libopenjpeg 
Note: Some of the previous patches have had two bugs that have been fixed
in this patch.
 2011-11-17 16:57:09 -07:00
Michael Niedermayer
32aa9590ac vf_scale: Fix slice position assert to take vertical subsampling into account. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 22:39:46 +01:00
Michael Niedermayer
5bccb2d096 sws: handle jpeg pixel formats in sws_init_context() 
Fixes Ticket576

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 22:00:20 +01:00
Clément Bœsch
3495817468 libutvideo: use K&R style. 2011-11-17 21:06:46 +01:00
Michael Niedermayer
30ca700ba1 ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3. 
Our ac3 code chain can handle it fine.
More ideal would be to write a demuxer that actually extracts what can be from the additional
headers and uses it for whatever it can be used for.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 20:29:55 +01:00
Michael Niedermayer
4fef94c6d2 swr: doxument matrix fields. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 20:29:55 +01:00
Clément Bœsch
0bfc03df3a swr: move code to avoid resample forward declaration. 2011-11-17 18:30:03 +01:00
Clément Bœsch
eafa2b6005 swr: introduce a public function to customize the channel mapping. 2011-11-17 18:30:03 +01:00
Tim Nicholson
d3baced24f doc: reword and clarify default stream selection. 2011-11-17 18:30:03 +01:00
Michael Niedermayer
5a2b3f3a52 aacdec: Avoid unneeded reinit due to ADTS headers 
Fixes Ticket 662

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 18:11:41 +01:00
Clément Bœsch
1dbd433f0d swr: use av_opt_set_int() instead of manual assignments in swr_alloc_set_opts(). 2011-11-17 17:57:20 +01:00
Clément Bœsch
f03afd5d54 swr: surround mixing is obviously used, fix comment. 2011-11-17 17:57:07 +01:00
Clément Bœsch
68d3144e89 swr: doxycomment public API. 2011-11-17 17:56:55 +01:00
Clément Bœsch
acd56efbeb swr: correctly raise rematrix AVERROR. 2011-11-17 17:56:52 +01:00
Michael Bradshaw
31ec694771 libopenjpeg: rename decoder source file. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 16:28:37 +01:00
Carl Eugen Hoyos
d50122eafa Do not try to read total disc or track number if data atom is too short. 
Fixes ticket #659.
 2011-11-17 14:12:34 +01:00
Clément Bœsch
7cdfce4f63 swr: fix "control reaches end of non-void function" compiler warning. 2011-11-17 10:16:08 +01:00
Clément Bœsch
809631af1a swr: bump minor version. 2011-11-17 10:16:07 +01:00
Clément Bœsch
af1eb298c1 swr: use int16_t instead of short for resampling. 2011-11-17 10:16:07 +01:00
Clément Bœsch
4c0bad513a swr: start doxycommenting the API. 2011-11-17 10:16:07 +01:00
Clément Bœsch
a768b9d825 swr: make swr_* functions match the prototypes. 2011-11-17 10:16:07 +01:00
Clément Bœsch
645c61fb2b swr: rename swr_alloc2() to swr_alloc_set_opts(). 2011-11-17 10:16:07 +01:00
Clément Bœsch
c4deb90cfa swr: use "swri_" prefix instead of "swr_" for the private API. 2011-11-17 10:16:07 +01:00
Clément Bœsch
64db5a1a57 swr: drop 'AV' prefix from ResampleContext. 
This type/struct is not part of the public API.
 2011-11-17 10:16:07 +01:00
Clément Bœsch
fc6351d019 swr: make audio convert code explicitely private. 
Only what's declared in libswresample/swresample.h is public.
 2011-11-17 10:16:07 +01:00
Clément Bœsch
3a5fc38574 swr: fix #endif comment ref. 2011-11-17 10:16:07 +01:00
Michael Niedermayer
3e971fc6b5 h264: fix cur_chroma_format_idc with slice multithreading. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 05:42:18 +01:00
Michael Niedermayer
1d23e5246c mjpeg: support mpo 
Fixes stereoscopic_photo.mpo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 03:13:50 +01:00
Michael Niedermayer
8709ba907a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegaudiodec: Don't use a nonexistent log context for av_dlog
  avformat: Accept the ISO8601 separate format as input, too
  avformat: Interpret times in ff_iso8601_to_unix_time as UTC
  avutil: Add av_timegm as a public function
  cinepak: Add another special case so that it can handle the following file:
  lagarith: add some RGBA decoding support
  lagarith: Add correct line prediction for RGB

Conflicts:
	doc/APIchanges
	libavcodec/cinepak.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 02:44:33 +01:00
Michael Niedermayer
4f7ad4c3e4 h264: migrate poc gap based has_b_frames calculation into new has_b_frame calculation code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 01:08:17 +01:00
Michael Niedermayer
ed83f84891 h264: minor simplification 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 00:36:38 +01:00
Michael Niedermayer
bfca35114a h264: rewrite has_b_frame calculation code, 
the previous implementation was too buggy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 00:01:40 +01:00
Michael Niedermayer
18b7f40007 h264: reset last_pocs on IDRs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 23:57:17 +01:00
Michael Niedermayer
7056f13a89 cinepak: remove redundant coordinate checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:47:05 +01:00
Michael Niedermayer
cea0c82d9b cinepak: check strip_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:47:05 +01:00
Michael Niedermayer
f35f50b311 cinepak, simplify, use AV_RB24() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:46:59 +01:00
Michael Niedermayer
111ffa55b7 cinepak: simplify, use FFMIN() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:45:11 +01:00
Clément Bœsch
69a501e6a1 ffprobe: small align cosmetic in json writer struct init. 2011-11-16 19:37:11 +01:00
Clément Bœsch
9813af259a ffprobe: make Writers constant. 2011-11-16 19:35:23 +01:00
Stefano Sabatini
f0db05008d ffprobe: apply misc cosmetics to compact writer definition 2011-11-16 18:40:09 +01:00
Stefano Sabatini
1f0d937f77 ffprobe: add csv writer 2011-11-16 18:40:03 +01:00
Michael Niedermayer
4e7b3ef3b3 cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:19:57 +01:00
Mike Melanson
12d9a36481 Add another special case to the Cinepak video decoder so that it can handle the following file: 
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov

This fix works around another work around which handles a different type
of odd Cinepak data.

Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:13:01 +01:00
Michael Niedermayer
974d25e2db mandelbrot: make mincol description and code match. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:13:01 +01:00
Martin Storsjö
268fb3f985 mpegaudiodec: Don't use a nonexistent log context for av_dlog 
This fixes builds with DEBUG defined, broken since
1158745a2d.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 12:01:32 +02:00
Martin Storsjö
18579f08e7 avformat: Accept the ISO8601 separate format as input, too 
This makes the function accept the format of creation_time
as output by demuxers (e.g. the mov demuxer), making the
creation timestamp stay intact if transcoding.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 11:22:43 +02:00
Martin Storsjö
4a83541650 avformat: Interpret times in ff_iso8601_to_unix_time as UTC 
This function is used in muxers for parsing the 'creation_time'
metadata key, for converting it to a time value.

This makes it match the behaviour of the exported 'creation_time'
metadata from demuxers, where it is in UTC, too.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 11:22:42 +02:00
Martin Storsjö
627067118c avutil: Add av_timegm as a public function 
This is useful, since the normal timegm function isn't a standard
function (requiring _BSD_SOURCE or _SVID_SOURCE on glibc to
be visible, and not available on e.g. windows). The widely available
function mktime uses the local time zone, which requires ugly
workarounds to handle UTC time.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 11:22:41 +02:00
Clément Bœsch
16b809ce8e lavfi: fix misc typo in avfilter.h header. 2011-11-16 09:53:58 +01:00
Mike Melanson
747283a078 cinepak: Add another special case so that it can handle the following file: 
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov

This fix works around another work around which handles a different type
of odd Cinepak data.

Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 10:50:52 +02:00