Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity
54569 commits 38 branches 400 tags 186 MiB
Commit graph

54569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
d1e8d4b055 ffmpeg: Allow overriding ffservers input 
Fixes Ticket1970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Michael Niedermayer
d7fbe926d3 ffmpeg: move creation_time for ffserver setting up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Paul B Mahol
a03e79ed5a lavfi: fix broken logic in metadata handling 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 20:13:56 +00:00
Michael Niedermayer
970c8df735 mpeg12dec: avoid reinitializtation on PS changes when possible. 
Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 21:55:04 +02:00
Michael Niedermayer
7dee9c2268 tests/fate/filter-audio: update asyncts reference 
The new reference matches the one used by qatar

Fixes: fate-filter-asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 19:44:27 +02:00
Paul B Mahol
19c8f22714 lavfi/rotate: switch to new drawutils 
Get rid of ugly hacks, also add support for more pixel formats.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
55c94f48ce lavfi/drawutils: fix planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
d2dd1e075c lavfi/pad: use FFSIGN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:48 +00:00
Alexandre Sicard
70b922f371 avformat/mov: read stream bitrates from isml manifest 
This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 17:36:45 +02:00
Michael Niedermayer
e096283ea5 mp3dec: detect CBR and use CBR axiom to seek 
This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 17:12:51 +02:00
Paul B Mahol
6150bec3f8 lavfi: add psnr filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 14:58:04 +00:00
Michael Niedermayer
1ba01d3d46 swscale: treat gray as a fullrage (0-255) format 
Fixes Ticket2684

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 15:21:48 +02:00
Carl Eugen Hoyos
b86651a208 Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c 
Avoids possible null pointer dereferences on oom.

Fixes ticket #2727.
 2013-07-08 11:56:16 +02:00
Michael Niedermayer
5d3c3035b7 cmdutils: replace exit() by exit_program() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 11:12:32 +02:00
Michael Niedermayer
eeddeb6579 ffmpeg_opt: replace exit() by exit_program() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 11:12:32 +02:00
Michael Niedermayer
efce76a80d ffmpeg_filter: replace exit() by exit_program() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 11:09:22 +02:00
Michael Niedermayer
44d0e520f8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: check and reset dithering index per channel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:26:17 +02:00
Michael Niedermayer
e1f98f2231 Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad' 
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
	libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:10:06 +02:00
Michael Niedermayer
d28a8ad8f3 Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14' 
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:02:52 +02:00
Michael Niedermayer
b5a87dc193 Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0' 
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af3910

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:53:52 +02:00
Michael Niedermayer
f982d006bb Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:34:11 +02:00
Michael Niedermayer
4cd066b69c Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a' 
* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:08:07 +02:00
Michael Niedermayer
7023715e88 Merge commit '38e9585de993c32899588ab037180f2c930ce74c' 
* commit '38e9585de993c32899588ab037180f2c930ce74c':
  Makefile: Remove stray tabs
  vp8: Wait for prev_frame to parse segment_map before reading it
  yuv4mpeg: Correctly round chroma up for odd luma sizes
  rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
  avio: Handle AVERROR_EOF in the same way as the return value 0

Conflicts:
	libavformat/rmdec.c
	libavformat/yuv4mpeg.c

No change as all the commits where already in before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 03:42:03 +02:00
Michael Niedermayer
5312c319be avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases 
This fixes speex in rtmp
Fixes Ticket2409

the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration

If this causes any problems, like premature analyze/probe end, please report!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 02:37:24 +02:00
Paul B Mahol
099e57bc38 zmbvenc: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:50:54 +00:00
Paul B Mahol
3bec6a44ea zmbvenc: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:45:17 +00:00
Paul B Mahol
ec4e042f33 gif: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:06:06 +00:00
Paul B Mahol
bd03f99d05 gif: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 22:57:17 +00:00
Luca Barbato
744a11c996 qdm2: check and reset dithering index per channel 
Checking per subband would have the index exceed the
dithering noise table size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:06:35 +02:00
Luca Barbato
76efedeadb qdm2: formatting cosmetics 
Apply the usual style plus drop few unnecessary return at the end
of void functions.
 2013-07-07 22:06:28 +02:00
Luca Barbato
f054e309c5 qdm2: use init_static_data 2013-07-07 22:06:20 +02:00
Luca Barbato
76f5dfbfd9 westwood_vqa: do not free extradata on error in read_header 
The extradata is already freed by avformat_open_input on
failure.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:04:43 +02:00
Luca Barbato
c4abc9098c vqavideo: check the version 
Prevent out of buffer write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:04:05 +02:00
Luca Barbato
636ced8e1d cmdutils: wrap exit explicitly 
Some C runtime implementations deadlock when calling threading functions
on the atexit() handler.

Use a simpler wrapper similar to av_log to call the cleanup function
before exit.

Bug-Id: 523
 2013-07-07 21:43:23 +02:00
Martin Storsjö
21732063a3 movenc: K&R formatting cosmetics 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 21:34:31 +03:00
Michael Niedermayer
38e9585de9 Makefile: Remove stray tabs 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 19:29:19 +03:00
Ronald S. Bultje
46d208e1e0 vp8: Wait for prev_frame to parse segment_map before reading it 
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:29 +03:00
Ronald S. Bultje
6c86a63bad yuv4mpeg: Correctly round chroma up for odd luma sizes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:22 +03:00
Michael Niedermayer
d35b6cd377 rmdec: Use the AVIOContext given as parameter in rm_read_metadata() 
This fixes crashes when playing back certain RealRTSP streams.

When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.

Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:12 +03:00
Michael Niedermayer
5d876be87a avio: Handle AVERROR_EOF in the same way as the return value 0 
This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:01 +03:00
Luca Barbato
f5e646a00a wtv: Mark attachment with a negative stream id 
A sid 0 would be mismatched to the attachment.

Prevent NULL pointer dereference.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 04:28:51 +02:00
Luca Barbato
a4baf96abd avprobe: rename the prettyprint structures 2013-07-07 04:28:51 +02:00
Paul B Mahol
19436308b4 dxa: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 16:33:59 +00:00
Michael Niedermayer
be25614177 mmsh: reimplement seeking 
Fixes Ticket2682

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 18:50:03 +02:00
Michael Niedermayer
c7cfd4cce9 avformat_find_stream_info: use fps_dts as last resort to determine duration 
Fixes long delay with some hardware generated h264 in ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 15:25:34 +02:00
Michael Niedermayer
19d4163331 avformat/mp3dec: read TOC even if not all needed information is available 
This fixes hyothetical bugs with parsing of elements after the TOC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 12:50:41 +02:00
Michael Niedermayer
4cc32e5cad avformat/mp3dec: read xing toc independant of usetoc, only skip filling index if requested 
Fixes hypothetical parsing bug with -usetoc 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 12:49:37 +02:00
Michael Niedermayer
a71832f826 avformat/Makefile: remove stray tab 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 11:56:02 +02:00
Michael Niedermayer
b9d55a07f3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wtv: Mark attachment with a negative stream id

Conflicts:
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 11:48:05 +02:00
Michael Niedermayer
b7ce510003 Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 
* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics

Conflicts:
	avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 11:35:59 +02:00