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
58,389 Commits 37 Branches 400 Tags 465 MiB
9440e47067
Commit Graph

58389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9440e47067 Merge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6' 
* commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6':
  hls: Check whether the AVIOContext contains a new redirected URL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 18:08:53 +01:00
Michael Niedermayer
15b2ec57cc Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362' 
* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
	libavformat/http.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:48:45 +01:00
Michael Niedermayer
1d19f1b196 Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33' 
* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33':
  http: Support relative URL redirection

Conflicts:
	libavformat/http.c

See: 4a4c93cb3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:41:45 +01:00
Timothy Gu
45ab71a8b8 doc: delete git-howto.txt 
This is already available in Texinfo version.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-22 17:26:32 +01:00
Michael Niedermayer
6d648dcfc9 Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8' 
* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
  http: Remove an unrelated and mistakenly set AVOption unit name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:18:52 +01:00
Michael Niedermayer
51268aaed2 avutil/utf8: put under #ifdef TEST 
All other test programs are under #ifdef TEST too
with the implementation and test code being generally in the same file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:16:11 +01:00
Michael Niedermayer
0398b7cbd3 avcodec/hnm4video: check intraframe size 
Fixes hypothetical integer overflow with HNM4_CHUNK_ID_IZ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:02:00 +01:00
Michael Niedermayer
6060234d43 avcodec/mjpegdec: check len in mjpeg_decode_app() more completely 
Avoids len from becoming negative and causing assertion failure

Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:02:00 +01:00
Michael Niedermayer
ba992711f7 avcodec/hnm4video: check that packetsize is at least 8 
Fixes integer overflow and assertion failure
Fixes: signal_sigabrt_7ffff7126425_1243_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:02:00 +01:00
Michael Niedermayer
7865759409 avformat/avidec: Dont assert the existence of an index for video streams. 
Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:02:00 +01:00
Stefano Sabatini
d20241c9b1 ffprobe: remove various useless "," 
Nitted-By: ubitux
 2013-11-22 16:58:24 +01:00
Stefano Sabatini
cbba331aa0 ffprobe: implement string validation setting 
This should fix trac tickets #1163, #2502.
 2013-11-22 16:51:56 +01:00
Stefano Sabatini
11cba3ba9d ffprobe: add support for nested options in writer contexts 2013-11-22 16:51:19 +01:00
Stefano Sabatini
e87190f5d2 ffprobe: check for errors, and abort immediately 
This allows to make use of validation features.
 2013-11-22 16:51:12 +01:00
Stefano Sabatini
68590650f0 lavu/avstring: add av_utf8_decode() function 2013-11-22 16:51:05 +01:00
Stefano Sabatini
e782eea183 lavu/dict.h: extend/clarify docs for av_dict_parse_string() 2013-11-22 15:51:20 +01:00
Stefano Sabatini
320389f88b lavu/dict.h: apply various fixes/extensions to doxy 
In particular, document AV_DICT_MATCH_CASE, AV_DICT_IGNORE_SUFFIX, and
extend documentation for av_dict_get().
 2013-11-22 15:51:10 +01:00
Stefano Sabatini
e2ad4e65a1 doc/encoders/libfdk_aac: state that VBR support is experimental 2013-11-22 14:55:01 +01:00
Stefano Sabatini
9459569897 doc/encoders/libfdk_aac: fix a few typos 2013-11-22 14:55:01 +01:00
Stefano Sabatini
80c85460fd doc/encoders/libfdk_aac: use @ref to reference libfaac 2013-11-22 14:45:43 +01:00
Martin Storsjö
8c92909814 hls: Check whether the AVIOContext contains a new redirected URL 
This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:08 +02:00
Martin Storsjö
be4edda673 http: Expose the content location via an AVOption 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:07 +02:00
Zhang Rui
393d80cc27 http: Support relative URL redirection 
In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.

[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:04 +02:00
Martin Storsjö
76267ecc82 http: Remove an unrelated and mistakenly set AVOption unit name 
This was due to a copypaste oversight.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:01 +02:00
Michael Niedermayer
9e22b8aca0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacps: Adjust some const qualifiers to suppress warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 13:01:11 +01:00
Michael Niedermayer
8617be28d0 Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6' 
* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
	libavcodec/pcx.c

See: 6462268e74
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:51:00 +01:00
Michael Niedermayer
bdf831859f Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a' 
* commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a':
  truemotion1: make sure index does not go out of bounds

See: fd4c1c0b70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:43:45 +01:00
Michael Niedermayer
4b3b702f92 Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035' 
* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
  avidec: fix a memleak in the dv init code.

Conflicts:
	libavformat/avidec.c

See: 8993c25695
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:38:58 +01:00
Michael Niedermayer
d7fbb63122 Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0' 
* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:28:49 +01:00
Michael Niedermayer
8c63ee4296 Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0' 
* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:25:01 +01:00
Michael Niedermayer
d86e27758f Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c' 
* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

See: dc6c36ce46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:09:30 +01:00
Michael Niedermayer
1ddc849bde Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf' 
* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
	libavformat/matroskadec.c

See: c63e76ba35
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 12:07:53 +01:00
Michael Niedermayer
fe540ae6b7 Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c' 
* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

See: ea0ac11e52
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 11:56:46 +01:00
Michael Niedermayer
7a88b7a9ad Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c' 
* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
  gifdec: convert to bytestream2

Conflicts:
	libavcodec/gifdec.c
	libavcodec/lzw.c
	libavcodec/lzw.h

See: 3fd60d8049
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 11:46:08 +01:00
Michael Niedermayer
564ae836fb avcodec/gifdec: print error if image is not within dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 11:00:02 +01:00
Michael Niedermayer
8b2578ab45 Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08' 
* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
  gifdec: check that the image dimensions are non-zero

Conflicts:
	libavcodec/gifdec.c

See: 286930d302
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 10:57:41 +01:00
Michael Niedermayer
ededb5ffed Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13' 
* commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13':
  h264_cavlc: check the size of the intra PCM data.

This check is redundant, but does no harm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 10:47:04 +01:00
Diego Biurrun
0ba8ba165b aacps: Adjust some const qualifiers to suppress warnings 2013-11-22 08:21:38 +01:00
Michael Niedermayer
9cbe834dfd avformat/avidec: Skip duplicate strf chunks 
Fixes Ticket3119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 02:06:03 +01:00
gcocherel
fb7d70c1cd hevc : add hevc profile 
(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
gcocherel
36658c978f hevc : update hevc_ps.c 
(cherry picked from commit 088f2eb1ae42bffc63c2cee4e7eba8f47056043b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
Michael Niedermayer
7c98c834e0 avformat/avidec: also print position in print_tag() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
Stefano Sabatini
50a28b1393 doc/examples: do not check NULL values for avcodec_close() 
avcodec_close() does nothing in case the argument is NULL. Simplify.
 2013-11-21 23:29:56 +01:00
Stefano Sabatini
98786aa2f0 lavfi/aevalsrc: initialize pointer to expression to NULL 
Fix crash in case of expression parsing failure.
 2013-11-21 23:14:38 +01:00
Clément Bœsch
616da59542 avcodec/x86/vp9dsp: merge a few SWAP together. 2013-11-21 23:06:21 +01:00
gcocherel
81d0252dac hevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba365807223e96a67d6c0ed) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 22:51:51 +01:00
gcocherel
0afa254d4e hevc : fix pcm(cherry picked from commit 12bbfdba1899d11044d2bd8457159fc8b4b52a76) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 22:51:51 +01:00
Anton Khirnov
430d121964 pcx: round up in bits->bytes conversion in a buffer size check 
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:58:27 +01:00
Anton Khirnov
c918e08b9c truemotion1: make sure index does not go out of bounds 
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:58:08 +01:00
Anton Khirnov
ce9bba5340 avidec: fix a memleak in the dv init code. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:57:58 +01:00