virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity
36,291 Commits 37 Branches 400 Tags
Commit Graph

36291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
16abd68779 seektest: floatfree 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 19:21:39 +01:00
Andrey Utkin
5b3265a718 lavfi: install libavfilter/vsrc_buffer.h 
It declares API necessary for filtering apps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-11 19:14:09 +01:00
Michael Niedermayer
616eaea8ad doc/ffmpeg.texi 
Merge changes done to avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 18:50:39 +01:00
Mans Rullgard
373211d828 Remove extraneous semicolons 
These semicolons cause invalid empty top-level declarations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-11 17:23:24 +00:00
Reimar Döffinger
c3068d43a8 Support VP8 in NSV. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 18:16:55 +01:00
Michael Niedermayer
a7aa628e9c regressiontest: try mp2 for wtv 
our ac3 decoder outputs different things on different platforms.

Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 17:52:40 +01:00
Michael Niedermayer
87d781de7a regressiontest: try to fix wtv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 16:23:30 +01:00
Clément Bœsch
cc2355817d life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
Clément Bœsch
c88d6b18ce life: add seed information in filter summary. 2011-12-11 13:36:58 +01:00
Stefano Sabatini
6c44ff38d6 lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
Reimar Döffinger
60b252eb57 Add caf format regression test. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 09:45:17 +01:00
Reimar Döffinger
f22c5bae52 Enable already existing rso regression test. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 09:45:17 +01:00
Reimar Döffinger
7c875c2d59 Add regression test for "sox" format muxer/demuxer. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 09:45:17 +01:00
Reimar Döffinger
33a43695c6 Add wtv seek test. 
I am not entirely sure the seek functionality is working correctly,
there are some strange cases like successful seek but no dts value.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 09:45:17 +01:00
Reimar Döffinger
5335bff9ec Add wtv lavf regression test. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-11 09:45:17 +01:00
Michael Niedermayer
1f183733e0 MAINTAINERS: extend syntax for entries 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 03:05:37 +01:00
Hanspeter Niederstrasser
bed04e2b03 Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 03:00:30 +01:00
Michael Niedermayer
964912aba5 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  Warn about avserver being broken.
  avconv: drop code for special handling of avserver streams.
  rawdec: don't set codec timebase.
  lavf doxy: add muxing stuff to lavf_encoding group
  lavf doxy: add demuxing stuff to lavf_decoding group
  lavf doxy: expand/reword metadata API doxy.
  lavf doxy: add installed headers to groups.
  lavf doxy: add avio groups into the lavf_io group.
  lavf doxy: rename lavf I/O group to lavf_io.
  lavf doxy: add metadata docs to the main lavf group
  ttadec: check channel count as read from extradata.
  Add CLJR encoding and decoding regression tests
  cljr: remove unused code
  flacdec: Support for tracks in cuesheet metadata block
  ptx: fix inverted check for sufficient data
  flac muxer: fix writing of file header and STREAMINFO header from extradata
  ptx: emit a warning on insufficient picture data
  utvideo: add fate tests covering all codec variants
  doc: update to refer to avconv
  doc: remove some stale entries from the faq
  ...

Conflicts:
	Changelog
	avconv.c
	doc/avconv.texi
	doc/faq.texi
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/avcodec.h
	libavcodec/cljr.c
	libavformat/avformat.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-11 01:05:33 +01:00
Martin Storsjö
0ebd4083e1 sdp: Restore the original mp4 format h264 extradata if converted 
If the sdp is generated before the rtp muxer is initialized
(e.g. as when called from the rtsp muxer), this has to be done,
otherwise the rtp muxer doesn't know that the input really is
in mp4 format.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-11 01:37:26 +02:00
Luca Abeni
e0a3c287b4 rtpenc: Add support for mp4 format h264 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-11 01:37:26 +02:00
Martin Storsjö
4dbac18e2e rtpenc: Simplify code by introducing a separate end pointer 
Also remove redundant parentheses.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-11 01:37:26 +02:00
Martin Storsjö
e2484fb644 movenc: Use the actual converted sample for RTP hinting 
If an annex b bitstream is muxed into mov, the actual written
sample is reformatted to mp4 syntax before writing.

Currently, the RTP hints that copy data from the normal video
track, where the payload data might be offset compared to the
original sample that the RTP hinting used (when 3 byte
annex b startcodes have been converted into 4 byte mp4 format
startcodes).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-11 01:37:26 +02:00
Diego Biurrun
da9cea77e3 Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
Michael Niedermayer
cdba9b617f eval.texi: document that variables are not shared between expressions. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 23:36:30 +01:00
Michael Niedermayer
3dea28cc2e h264: Fix concealment regression introduced by babf4fe01a808327d53977ba319c113a930180b1 
Limit the new case to when the decoder is flushed instead of at each idr frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 23:26:38 +01:00
Michael Niedermayer
8743400961 h264: reset prev_poc_msb to the same value everywhere. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 23:03:49 +01:00
Anton Khirnov
2e87b4c511 Warn about avserver being broken. 
Also remove mentions of it from other avtools' manuals.
 2011-12-10 22:02:44 +01:00
Anton Khirnov
5bf6638022 avconv: drop code for special handling of avserver streams. 
It's broken and doesn't work anyway.

This patch means that avconv will ignore encoding options from the ffm
file and will instead use whatever is provided on the commandline as for
normal output.
 2011-12-10 22:02:44 +01:00
Anton Khirnov
e745d7525a rawdec: don't set codec timebase. 
It's not supposed to be set outside of lavc. Set r_frame_rate and
avg_frame_rate instead.
 2011-12-10 22:02:44 +01:00
Anton Khirnov
489a7b07e9 lavf doxy: add muxing stuff to lavf_encoding group 2011-12-10 22:02:28 +01:00
Anton Khirnov
370f27dee3 lavf doxy: add demuxing stuff to lavf_decoding group 2011-12-10 22:02:28 +01:00
Anton Khirnov
28b4c06b9d lavf doxy: expand/reword metadata API doxy. 2011-12-10 22:02:28 +01:00
Anton Khirnov
eca06cbed9 lavf doxy: add installed headers to groups. 2011-12-10 22:02:28 +01:00
Anton Khirnov
fb42db7c39 lavf doxy: add avio groups into the lavf_io group. 2011-12-10 22:02:28 +01:00
Anton Khirnov
e4f4a1f93e lavf doxy: rename lavf I/O group to lavf_io. 2011-12-10 22:02:28 +01:00
Anton Khirnov
b262a05904 lavf doxy: add metadata docs to the main lavf group 2011-12-10 22:02:28 +01:00
Michael Niedermayer
934fe00680 ffmpeg: better warning about loop_input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 21:03:47 +01:00
Shitiz Garg
8bd1f1a4c8 ttadec: check channel count as read from extradata. 
fixes floating-point exception due to channels being set to 0.
fixes Bug 128.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-10 14:54:19 -05:00
Paul B Mahol
7d18d17abd Add CLJR encoding and decoding regression tests 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-10 20:11:29 +01:00
Paul B Mahol
65c1011404 cljr: remove unused code 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-10 20:11:28 +01:00
Paul B Mahol
3c1f60860d flacdec: Support for tracks in cuesheet metadata block 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-10 13:42:40 -05:00
Reimar Döffinger
78fde9323d Run zmbv regression without md5sum. 
Judging by the differences this should make all FATE
machines pass the test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-10 19:34:28 +01:00
Reimar Döffinger
0849a0ebb2 rtmpproto: make condition work in overflow case. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-10 19:34:28 +01:00
Reimar Döffinger
8b8a47f6fb Make detection of single-stream flv work again. 
It had become dead code when code was added to avoid
exporting audio and video codec id as metadata.
Untested due to lack of sample.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-10 19:34:28 +01:00
Michael Niedermayer
cc61643123 h264: improve "no picture" debug output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Michael Niedermayer
5b2873c1d5 h264: switch from qatars has_b_frames calculation back to mine. 
Their 2nd try does like the first not work at all.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Michael Niedermayer
257c85cddd adpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and -r 0.001:1 
Bug-Found-by: Shitiz Garg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-10 18:51:48 +01:00
Janne Grunau
8d61eef917 ptx: fix inverted check for sufficient data 
Fix regression introduced in 2b53e69.
 2011-12-10 17:01:27 +01:00
Nicolas George
337ce558b6 fftools: add -report option. 2011-12-10 16:40:03 +01:00
Justin Ruggles
28101f6c4e flac muxer: fix writing of file header and STREAMINFO header from extradata 
fixes Bug 119
 2011-12-10 10:19:41 -05:00