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
55,135 Commits 37 Branches 400 Tags 460 MiB
0c8efe4891
Commit Graph

55135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
a5155294e5 pnm: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:27:36 +00:00
Paul B Mahol
329221eee7 pnm: fix 255 < maxval < 65535 for pam with depth 1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:27:36 +00:00
Carl Eugen Hoyos
2c046c718a Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535." 
The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e49b.
 2013-07-29 00:05:43 +02:00
Paul B Mahol
768e40b451 Revert "pnm: remove nonsense code" 
Breaks decoding pgms with 256 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.

This reverts commit a0348d0966.
 2013-07-28 21:45:37 +00:00
Luca Barbato
2219e27b5b oma: correctly mark and decrypt partial packets 
Incomplete crypted files would lead to a read after buffer boundary
otherwise.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 22:54:55 +02:00
Luca Barbato
9d0b45ade8 oma: check geob tag boundary 
Prevent read after buffer boundary on corrupted tag.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 22:54:55 +02:00
Luca Barbato
4f03a77e52 oma: refactor seek function 
Properly propagate seek errors from avio and the generic pcm seek.
 2013-07-28 22:54:55 +02:00
James Almer
ac8e70d735 oggenc: Write stream metadata if available 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 21:10:51 +02:00
Luca Barbato
3ca1dd2502 xl: Make sure the width is valid 
And undo the wrong commit f1cb490d6d

CC: libav-stable@libav.org
 2013-07-28 19:36:44 +02:00
Carl Eugen Hoyos
7651c0e49b Avoid overflows when reading pgm files with maxval != 255 and != 65535. 
libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.
 2013-07-28 19:07:06 +02:00
Carl Eugen Hoyos
7e8e8ba9cc Assume gray8 if 1 < maxval <= 255 in pgm. 2013-07-28 18:12:23 +02:00
Zhang Rui
0f51c398be http: Support reading gzip/deflate compressed data 
Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Normally, http servers shouldn't send this to us since we
don't advertise it with an Accept-Encoding header, but some
servers still do it anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-28 18:39:49 +03:00
Carl Eugen Hoyos
ae4dc0b37a Set bits_per_raw_sample when decoding mjpeg / ljpeg. 
The ljpeg decoder also supports gray images with
8 - 15 bits per component.
 2013-07-28 17:13:01 +02:00
Matthieu Bouron
8a09195545 lavf/movenc: improve psp check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 17:05:05 +02:00
Matthieu Bouron
ee4ef139e3 lavf/movenc: remove useless checks on AVOutputFormat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 17:05:01 +02:00
Paul B Mahol
b09d86c636 utvideoenc: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-07-28 10:57:51 -04:00
Florent Tribouilloy
2186a7e547 ffprobe: add -show_programs option 
The option is used to sort the streams by program.

Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-28 16:39:06 +02:00
Stefano Sabatini
2fcd400669 ffprobe: do not treat array elements as nested in the compact writer 
This fixes rendering of sections containing nested elements followed by
an array, for example as in the case:
programs->streams->stream

enabled by the -show_programs option.
 2013-07-28 16:38:50 +02:00
Stefano Sabatini
18df69d238 doc/ffprobe.xsd: specify tag elements in stream after disposition element 
Fix XML schema validation, since elements must appear in the same order
as specified in the schema.
 2013-07-28 16:38:49 +02:00
Luca Barbato
62b1e3b103 aasc: Check minimum buffer size 
Prevent some overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 15:41:59 +02:00
Luca Barbato
45ee556d51 qdm2: Whitespace cosmetics 2013-07-28 14:58:19 +02:00
Luca Barbato
0e78ef0f94 flac: use meaningful return values 2013-07-28 14:58:18 +02:00
Michael Niedermayer
f0308af5fa Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: cosmetics: Consistently format list and table items

Conflicts:
	doc/developer.texi
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 14:21:11 +02:00
Michael Niedermayer
b0edd59994 Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:44:34 +02:00
Michael Niedermayer
8ff23f0e3c Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df' 
* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
	libavutil/eval.c

See: 3cd9849d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:37:46 +02:00
Michael Niedermayer
2655c1ac12 Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d' 
* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d':
  Remove unreachable returns

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:23:54 +02:00
Michael Niedermayer
3afcddcff2 Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848' 
* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
  avidec: Let the inner dv demuxer take care of discarding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:15:21 +02:00
Michael Niedermayer
d781220991 Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4' 
* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:06:38 +02:00
Luca Barbato
f1cb490d6d xl: Fix the buffer size check 
Also make it the first check.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 12:45:05 +02:00
Luca Barbato
e13a929314 xl: K&R formatting cosmetics 2013-07-28 12:45:05 +02:00
Michael Niedermayer
1ecf380223 Merge commit '37063714c0a064808f9671ec4d376955d664f463' 
* commit '37063714c0a064808f9671ec4d376955d664f463':
  build: Only check FATE dependencies when running FATE tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:54:27 +02:00
Michael Niedermayer
102397d2c1 Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c' 
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:40:49 +02:00
Michael Niedermayer
edab63a406 Merge commit '966689442ed843019dc0722a49bfb0ac51755d19' 
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:26:57 +02:00
Marton Balint
63c0113588 lavc: do not override format if neither text nor bitmap codec prop is set 
Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8 dpx: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204 dpxenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4 targa_y216dec: remove empty function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd zmbv: return meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b utvideoenc: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e Forward interlaced field information from mov to v210 decoder. 
Reported and tested by Dave Rice.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-07-27 18:57:28 +02:00
Stefano Sabatini
b4bd21b7fe doc/codecs: fix dangling reference to codec-options chapter 2013-07-27 16:50:19 +02:00
Diego Biurrun
270d7e3a18 doc: cosmetics: Consistently format list and table items 2013-07-27 16:24:55 +02:00
Diego Biurrun
bf4b0ed1d5 Add missing deprecation attributes 2013-07-27 16:08:49 +02:00
Diego Biurrun
5b097399ba eval: Explicitly ignore return value of strtod() in parse_db() 
The return value is not needed.  This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’
 2013-07-27 16:00:41 +02:00
Diego Biurrun
6ff15cd569 Remove unreachable returns 2013-07-27 16:00:41 +02:00
Luca Barbato
c8f0b20b4a avidec: Let the inner dv demuxer take care of discarding 
CC: libav-stable@libav.org
 2013-07-27 16:00:11 +02:00
Luca Barbato
10aa44aa67 avidec: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-27 16:00:11 +02:00
Diego Biurrun
37063714c0 build: Only check FATE dependencies when running FATE tests 
Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-27 16:50:21 +03:00
Michael Niedermayer
3adf054b22 avcodec/vorbisenc: change 6 asserts to av_asserts() 
speed relevant ones use av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4 avcodec/mpegvideo: update disabled assert() to av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 15:23:13 +02:00