RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,707 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

47707 Commits

Author SHA1 Message Date
Michael Niedermayer e7101a7f3f libavcodec/x86/mpegvideo: switch to av_assert2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 23:30:16 +01:00
Michael Niedermayer 623184afa2 itu H.263: Fix handling of PB blocks 
This fixes artifacts in Ticket744

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 23:23:27 +01:00
Michael Niedermayer c3bb3334f6 h264: dont try to allocate scratchpad if linesize is not known 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 20:52:14 +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
Paul B Mahol a354839bfa build: update mxf muxer dependencies 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-10 13:59:15 +00:00
Paul B Mahol d880c34408 lavc: fix typo and avrn build dependencies 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-10 13:49:53 +00:00
Michael Niedermayer ddbf0702c5 dsputil_mmx: switch to av_assert2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 14:41:31 +01:00
Paul B Mahol 4c7515286b takdec: silence/fix warning for undefined behavior 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-10 12:06:30 +00:00
Michael Niedermayer 4a5289ade3 mips: disable ac3 downmix, until its updated to the new data layout. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 12:45:11 +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
Peter Ross e044cd4123 codec_desc: AV_CODEC_ID_SMPTE_KLV is data 2012-12-10 21:08:09 +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
Mans Rullgard f9e493c6f5 sh4: dsputil: remove duplicate of ff_gmc_c() 
This function is an exact duplicate of the generic one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-10 09:53:58 +00:00
Michael Niedermayer 7aabeea9ba ac3dec: fix bugs in direct buffer use. 
This fixes potentially exploitable out of array writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 04:45:30 +01:00
Michael Niedermayer 529d3e0026 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 02:16:33 +01:00
Michael Niedermayer a933698457 Merge commit '30b39164256999efc8d77edc85e2e0b963c24834' 
* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 02:06:50 +01:00
Michael Niedermayer b7d8484f27 Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047' 
* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:32:37 +01: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
Mans Rullgard 5c75708cf0 configure: fix automatic processing of _extralibs in check_deps 
This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-10 01:23:23 +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
Michael Niedermayer cbe43e62c9 ffserver: set oformat 
Fix Ticket1986

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 23:39:06 +01:00
Mans Rullgard 2dd95bd7cf dsputil: remove unused macro WRAPPER8_16 
This macro has never been used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-09 22:21:04 +00: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
Mans Rullgard d4f8cecc86 configure: fix automatic processing of _extralibs in check_deps 
This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-09 21:20:58 +00:00
Stefano Sabatini 461b5bf4ab lavc/avcodec: extend/clarify/fix documentation for avcodec_fill_audio_frame() 2012-12-09 21:55:46 +01: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 0af7ccd9e2 mpeg12: move current_picture_ptr reset to the end of decode_frame. 
This fixes passing fields instead of frames into the decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:49:51 +01:00
Martin Storsjö 774e6fc9ed libvpxenc: Support forcing keyframes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-09 20:28:08 +02: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
Carl Eugen Hoyos 18eb31963b Improve x264opts description. 2012-12-09 18:24:56 +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 3193a5cdbf arm: put prefetch under matching #ifdef as the actual code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 17:14:15 +01:00
Mans Rullgard 30b3916425 ac3dec: make downmix() take array of pointers to channel data 2012-12-09 15:52:01 +00:00
Mans Rullgard b8f3ab8e6a ac3dec: output planar float only 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-09 15:52:01 +00:00
Mans Rullgard ec5da7aee2 ac3dec: decode directly into output buffers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-09 15:52:01 +00:00
Janne Grunau 288bb3da16 svq3: make slice type value unsigned to match svq3_get_ue_golomb return type 2012-12-09 15:51:45 +01:00
Diego Biurrun 998c1ee10c configure: Have protocols select network code instead of depending on it 2012-12-09 14:56:12 +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
Michael Niedermayer e7d924da30 Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a' 
* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
  lavf: fix arithmetic overflows in avformat_seek_file()
  mjpeg: initialize input padding after unescaped buffer to zero

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 13:56:46 +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
Diego Biurrun ba0c898120 cosmetics: Fix dropable --> droppable typo 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
Carl Eugen Hoyos 66dc3ba356 Flip zerocodec output. 
Fixes ticket #1218
 2012-12-09 10:24:16 +01:00
Luca Barbato 1dd1c1c884 avio: K&R cosmetic formatting 2012-12-09 09:45:45 +01:00