virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
45,872 Commits 37 Branches 400 Tags 460 MiB
34ccb94796
Commit Graph

45872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9317b73f11 Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401' 
* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
  fate: dependencies for seek tests
  fate: handle lavf test dependencies entirely in make

Conflicts:
	configure
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 11:42:42 +02:00
Michael Niedermayer
5806cd9365 fate: dependencies for ffmpeg vsynth tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 11:01:53 +02:00
Michael Niedermayer
aadaa8112a fate: dependencies for ffmpeg acodec tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 11:01:15 +02:00
Michael Niedermayer
17e4b0644b Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b' 
* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

Conflicts:
	tests/fate/acodec.mak
	tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 10:48:00 +02:00
Michael Niedermayer
eb19d89d8e cache: check lseek() return 
Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 00:55:03 +02:00
Martin Storsjö
b760ffdd07 aviobuf: Remove a senseless ifdef in avio_seek 
This seemed to assume that one never used writing avio unless
muxers or networking was enabled.

This ifdef is a remnant since 8fa641f8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-18 01:44:05 +03:00
Michael Niedermayer
ce739e66f4 cmdutils: add missing check for ftell() return 
Fixed CID703706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 00:10:59 +02:00
Mans Rullgard
b93e934aee mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:37:12 +01:00
Mans Rullgard
36ac9a16a1 fate: dependencies for seek tests 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Mans Rullgard
292d1e7874 fate: dependencies for acodec tests 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Mans Rullgard
206a070dce fate: list lavfi tests in a makefile 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Mans Rullgard
fa26335003 fate: handle lavf test dependencies entirely in make 
This makes the lavf tests depend on all codecs and formats they use.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Mans Rullgard
b262e45597 fate: dependencies for vsynth tests 
This makes the vsynth tests run only if the required codecs and
formats are enabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Mans Rullgard
21fed588cb fate: add macros useful for conditionally enabling things 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-17 22:31:18 +01:00
Alexis Ballier
916352f282 configure: do not quote arguments passed to filter{,_out} in check_ld. 
This fixes the following error:
./configure: eval: line 417: syntax error near unexpected token `-lcdio_cdda'
[...]
Broken by 66a1ccd74 when doing, e.g., ./configure --enable-gpl --enable-libcdio.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 23:28:50 +02:00
Michael Niedermayer
35daf3ca81 cmdutils: remove unneeded null check 
Fixes CID703769
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 23:28:50 +02:00
Stefano Sabatini
eebde404bc examples/muxing: merge add_audio_stream() and add_video_stream() 
Factorize.
 2012-10-17 21:39:13 +02:00
Stefano Sabatini
eda0a52bf1 examples/muxing: check on frame 
Fix crash in case frame is not defined (e.g. with muxing out.wav).
 2012-10-17 21:39:13 +02:00
Stefano Sabatini
d6196d9421 examples/muxing: fix bogus setting of st->id 2012-10-17 21:39:12 +02:00
Stefano Sabatini
5ca298df2d examples/muxing: remove misleading comment about pending API change 
The API was never changed since 2003. Replace with a comment about the
performed operation.
 2012-10-17 21:39:12 +02:00
Stefano Sabatini
1f7962625c examples/muxing: remove video_outbuf unused and useless code 2012-10-17 21:39:12 +02:00
Nicolas George
709628aa71 lavfi/avf_concat: fix invalid exclusive test. 
The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.

Fix coverity issue CID 733850.
 2012-10-17 21:28:58 +02:00
Michael Niedermayer
d185c8a79b tiff: run strlen() after setting the pointer 
Fixes CID733803
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:58:08 +02:00
Michael Niedermayer
f03c0f6afc ffmdec: check av_new_packet() return value 
Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:45:59 +02:00
Michael Niedermayer
a0e0e1e192 ffmdec: fix hypothetical overflows 
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:36:30 +02:00
Michael Niedermayer
71bc8c95d7 ffm_read_write_index: check lseek return code 
Fixes CID732184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:35:16 +02:00
Michael Niedermayer
378a5b9c5f ffm_write_write_index: check lseek() return code 
Fixes CID732185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:23:16 +02:00
Michael Niedermayer
7fd65104f4 ffm_seek: fix division by zero 
Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:14:43 +02:00
Michael Niedermayer
657998b5ee libavfilter/lavfutils: remove useless NULL check on format context 
Fixes: CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:00:31 +02:00
Michael Niedermayer
fd9e88fe60 libavfilter/lavfutils: remove useless NULL check on codec context 
The code would crash before if it was NULL

Fixes CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 20:00:20 +02:00
Michael Niedermayer
a4fe661157 mov_probe: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 17:50:14 +02:00
Paul B Mahol
9b762e2cba idcinvideo: remove redundant " id CIN Video: " from av_log() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 14:09:47 +00:00
Justin Ruggles
abd8b9e7e0 libmp3lame: resize the output buffer if needed 
The LAME API documentation for the required buffer size refers to the size for
a single encode call. However, we store multiple frames in the same output
buffer but only read 1 frame at a time out of it. As a result, the buffer size
given in lame_encode_buffer() is actually smaller than what it should be.
Since we do not know how many frames it will end up buffering, it is best to
just reallocate if needed.
 2012-10-17 09:59:13 -04:00
Michael Niedermayer
775d41b617 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:53:42 +02:00
Michael Niedermayer
940ee63630 Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4' 
* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
  wav: do not fail on empty INFO tags

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:52:04 +02:00
Michael Niedermayer
df5e089da9 Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1' 
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:46:08 +02:00
Michael Niedermayer
d8cfa98358 Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' 
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 15:16:23 +02:00
Michael Niedermayer
c079da5073 Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 
* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:43:26 +02:00
Michael Niedermayer
fadfbb354b Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
	ffmpeg_opt.c
	libavformat/riff.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:30:25 +02:00
Michael Niedermayer
d6e87190fd Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
	ffserver.c
	libavcodec/ffv1.c
	libavformat/ffmdec.c
	libavformat/nutenc.c
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:17:55 +02:00
Paul B Mahol
1ade37ae9c lavc/tta: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 12:11:34 +00:00
Paul B Mahol
d6ea59b860 tta: datalen is unsigned integer per reference library 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 11:58:08 +00:00
Michael Niedermayer
364c60bf64 sws-test: parse command line args before initing contexts 
This fixes parsing comand line args after ref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 11:56:36 +02:00
Clément Bœsch
711ffb84df lavf/swfdec: support DefineBitsLossless{,2} tag. 2012-10-17 07:49:17 +02:00
Michael Niedermayer
4e2e3d943e ffv1: fix packed rgb with 1.3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 03:19:11 +02:00
Michael Niedermayer
adbb75dbd8 mov: fix time types related to mov_metadata_creation_time 
Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 02:48:30 +02:00
Michael Niedermayer
7b8fd29816 examples/muxing: fix video pts 
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 02:40:00 +02:00
Derek Buitenhuis
c75848cd4c configure: Add support for Tilera processors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-16 18:24:18 -04:00
Michael Niedermayer
5d2b885074 lavfi: limit matching w/h/fmt asserts to non scale filters 
This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 00:06:12 +02:00
Michael Niedermayer
6cbb8a450f libavfilter/buffersrc: Do not fail hard on changes of input parameters. 
Several filters support this already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 00:06:12 +02:00