virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
47,765 Commits 37 Branches 400 Tags 463 MiB
0ceca269b6
Commit Graph

11854 Commits

Author SHA1 Message Date
Nicolas George
16c3cb9bbf lavf/concatdec: avoid leaking URLs. 
Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.
 2012-12-12 12:15:57 +01:00
Michael Niedermayer
75b3911e5a mxf_set_audio_pts: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:35:47 +01:00
Michael Niedermayer
a0f659b275 oggspeexparse: fix array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:21:23 +01:00
Michael Niedermayer
8dbc384f15 Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3' 
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 10:16:23 +01:00
Michael Niedermayer
d276f28b7d swfdec: print warning when len is cliped 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 10:14:06 +01:00
Michael Niedermayer
be5389d585 Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a' 
* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
	libavformat/swfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 09:55:56 +01:00
Michael Niedermayer
a202541f9b cafdec: Check duration before use. 
Fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 01:22:09 +01:00
Michael Niedermayer
99a8552dae bfi: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 01:22:09 +01:00
Michael Niedermayer
7d05bbb656 mxfdec: drop unneeded extradata padding 
Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 16:40:28 +01:00
Justin Ruggles
d04c17c913 swfdec: cosmetics: fix indentation 2012-12-11 09:37:17 -05:00
Justin Ruggles
e70c5b034c swfdec: do better validation of tag length 
Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.
 2012-12-11 09:36:26 -05:00
Michael Niedermayer
b65570808c mxfdec: fix leak of extradata 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 14:43:47 +01:00
Peter Ross
53ae32d331 iff demuxer: support RGB8 and RGBN 2012-12-11 20:17:30 +11:00
Michael Niedermayer
67c1b5b026 lavf: remove unneeded pb check 
Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 09:34:47 +01:00
Michael Niedermayer
b688a28470 astenc: fix assignment vs compare 
Fixes CID747736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 08:56:42 +01:00
Michael Niedermayer
a70b38d2dd lavf: fix memleak 
Fixes CID747738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 08:51:34 +01:00
Stefano Sabatini
8e9056559e lavf/segment: add reset_timestamps option 
The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.

It is meant to address trac ticket #1425.
 2012-12-11 00:18:23 +01:00
Michael Niedermayer
0a60f83075 http: dont null check p, its unneeded 
Fixes CID747740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 00:03:23 +01:00
Michael Niedermayer
c73685398d swfdec: check lens validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 17:25:44 +01:00
Michael Niedermayer
6321e02896 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Remove an outdated todo comment
  rtpdec: Rename a static variable to normal naming conventions
  sh4: dsputil: remove duplicate of ff_gmc_c()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 12:13:42 +01:00
Peter Ross
f540851ce3 mov: parse @PRM and @PRQ metadata tags 
These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.
 2012-12-10 21:12:59 +11:00
Martin Storsjö
ccb59c106a rtpdec: Remove an outdated todo comment 
This comment was added in e309128f, in 2002, and has been brought
along since then more or less unmodified.

The first point of the todo was implemented in dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in 8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-10 11:58:32 +02:00
Martin Storsjö
0d85663a47 rtpdec: Rename a static variable to normal naming conventions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-10 11:58:25 +02:00
Michael Niedermayer
78ac7ee970 Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264' 
* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:27:10 +01:00
Michael Niedermayer
20899c54f0 http/utils: rename "demuxer" to mime_type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:00:16 +01:00
Paul B Mahol
cef28b5602 tak: reduce difference with qatar 
Mostly cosmetics changes, but also makes
decoding little faster here.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 22:01:00 +00:00
Stefano Sabatini
ad47ac20ae lavf/segment: remove silly assert(), improve feedback 
The code should not assert in case of invalid user input. Fails
gracefully instead.
 2012-12-09 20:42:35 +01:00
Michael Niedermayer
68bc012190 http/utils: move mime -> demuxer maping from http to utils 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 20:24:49 +01:00
Michael Niedermayer
e3d95b54db probe: belive protocol content type if set and avoid lengthly probing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:12:34 +01:00
Michael Niedermayer
76d851b656 http: export ICY content type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:12:34 +01:00
Nicolas George
160013736e lavf: TED Talks JSON captions demuxer. 2012-12-09 18:50:38 +01:00
Peter Ross
9282fbb9ad mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 17:15:46 +01:00
Michael Niedermayer
1374b5e15b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avio: K&R cosmetic formatting

Conflicts:
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 14:08:01 +01:00
Martin Storsjö
5d471b73d2 rtpdec: K&R formatting and spelling cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-12-09 13:36:11 +01:00
Michael Niedermayer
5de1f7a7bd Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 
* commit '18e6f087c4a50bede8449ee164778945480be50c':
  img2: document the options available
  hls: improve options description
  hls: use a meaningful long name
  hls: add start_number option
  h264: check for invalid zeros_left before writing

Conflicts:
	doc/demuxers.texi
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 13:35:49 +01:00
Michael Niedermayer
9f92e590ba mxfdec: fix double free 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 11:46:26 +01:00
Luca Barbato
1dd1c1c884 avio: K&R cosmetic formatting 2012-12-09 09:45:45 +01:00
Paul B Mahol
92f630eaf2 add forgotten AV_ prefix to some CODEC_IDs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 01:47:58 +00:00
Mans Rullgard
91ac403b13 lavf: fix arithmetic overflows in avformat_seek_file() 
The values compared here can be more than INT64_MAX apart.  Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-08 19:35:16 +00:00
Luca Barbato
adbe03077d hls: use a meaningful long name 2012-12-08 17:04:22 +01:00
Luca Barbato
5fbceb2c63 hls: add start_number option 2012-12-08 17:04:22 +01:00
Michael Niedermayer
57cee85023 Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
	libavcodec/parser.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:58:56 +01:00
Michael Niedermayer
7efee140d7 get_bits: rename get_bits_longlong to get_bits64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:53:01 +01:00
Michael Niedermayer
b2b12a1022 mpegts: rename get_bits64 to get_ts64 
Renaming because of name conflict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:52:50 +01:00
Reimar Döffinger
8ee14aa5c7 lavf: improve avoid_negative_ts help text 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 13:30:43 +01:00
Paul B Mahol
57231e4d5b tak: demuxer, parser, and decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Michael Niedermayer
41540b36a1 bitstream: add get_bits64() to support reading more than 32 bits at once 
Also remove a duplicate function in the MPEG-TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Clément Bœsch
710c4baf52 lavf: VobSub demuxer. 2012-12-07 21:18:06 +01:00
Paul B Mahol
fe63d41302 brstm: do not return partial packets 
Such packets are useless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 17:55:45 +00:00
Michael Niedermayer
7c425e4f2d Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333' 
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
  h264: check sps.log2_max_frame_num for validity
  mov: validate number of DataReferenceBox entries against box size
  mov: compute avg_frame_rate only if duration is known
  flac: change minimum and default of lpc_passes option to 1

Conflicts:
	libavcodec/h264_ps.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-07 15:52:43 +01:00