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

2143 Commits

Author SHA1 Message Date
Michael Niedermayer e2877bdf38 ffmpeg: remove incorrect network deinit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-28 15:57:21 +02:00
Michael Niedermayer 93db2708d3 ffmpeg: Fix null pointer dereference in do_video_out() 
Fixes: CID1295087

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 23:44:19 +02:00
Michael Niedermayer 959894632a Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-04 00:38:02 +02:00
Michael Niedermayer 4d02dfbde4 ffmpeg: Fix extradata allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-04 00:02:14 +02:00
Michael Niedermayer 6eb6956d06 ffmpeg: Fix indentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:39:06 +02:00
Michael Niedermayer 98c7729c13 ffmpeg: last frame duplication heuristic 
This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:09:31 +02:00
Himangi Saraogi d768f8f5cf ffmpeg: Avoid null pointer dereferences 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 13:06:00 +02:00
Michael Niedermayer 215c2fe0ae Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995' 
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
  avconv: Print the avfilter errors

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 20:33:27 +01:00
Michael Niedermayer f063a0b33d Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56' 
* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
  avconv: do not abort immediately if initializing hwaccel fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-10 10:49:48 +01:00
Clément Bœsch c285937ccc ffmpeg: comment mpeg4 hack 
See 3734c3ea51
 2015-03-03 20:25:28 +01:00
Michael Niedermayer 5ee3a40f1c ffmpeg: Fix -vstats when coded_frame is not set 
There are several encoders which do not set coded_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-28 12:33:44 +01:00
Nicolas George d92c6d82c0 ffmpeg: notify when the thread message queue blocks. 
This can help finding the source of A-V desync with live input.
 2015-02-26 19:19:56 +01:00
Nicolas George 508d6a23b4 ffmpeg: allow to set the thread message queue size. 2015-02-26 19:19:56 +01:00
Michael Niedermayer 2384933985 ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-11 11:22:27 +01:00
Michael Niedermayer 77f326dc36 ffmpeg: Make CFR frame drop threshold user adjustable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 02:40:41 +01:00
Paul B Mahol 5274860fe2 ffmpeg: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:11 +00:00
Christophe Gisquet 1fa637d2ef ffmpeg: free_input_threads requires HAVE_PTHREADS 
Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 14:47:08 +01:00
Michael Niedermayer 85d7e02e4a ffmpeg: allow overriding and amending AVStream->disposition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 01:27:21 +01:00
Michael Niedermayer 90c98994f6 ffmpeg: Reduce noisiness of frame clipping in rate convertion 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-19 03:51:43 +01:00
Michael Niedermayer a582705d15 ffmpeg: Favor filter graph based duration over ost->frame_rate in fps code 
The fate change adds a last frame with a subtitle not displayed in the previous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-19 03:13:16 +01:00
Michael Niedermayer f96148913b Fix precission typos 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 22:42:42 +01:00
Michael Niedermayer d3d9a00bcd ffmpeg: Use filter graph output frame rate also for frame duration estimation 
Previously the duration was sometimes wrong, this addition
limits the value and improves which frames are choosen when
reducing the frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 20:33:08 +01:00
Michael Niedermayer 7b32856011 ffmpeg: Maintain higher precision pts between video filter and fps code 
This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms

Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 19:53:17 +01:00
Michael Niedermayer 261e8ccbd1 ffmpeg: drop redundant frame_pts value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 16:42:20 +01:00
Anshul Maheshwari bb0344dc55 ffmpeg: improve data stream support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:52:04 +01:00
raxon1s 4184d344af ffmpeg: Add bitrate value under -progress action 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 00:31:08 +01:00
Michael Niedermayer 0409155261 ffmpeg: remove unneeded NULL pointer check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 15:55:07 +01:00
Michael Niedermayer 6d1a2efb8a ffmpeg: Clear error message array at init. 
This avoids printing uninitialized bytes if no error message is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 23:02:30 +01:00
Michael Niedermayer 78cb3c069d ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:10:58 +01:00
Michael Niedermayer 627f5658b6 ffmpeg: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 02:56:02 +01:00
Simon Thelen cc63da1223 ffmpeg: add sdp_file option 
Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 02:05:34 +01:00
Michael Niedermayer d2f9aefbde ffmpeg: Check for subtitle_out malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 23:26:54 +01:00
Michael Niedermayer 28a6f970f6 ffmpeg: forward r_frame_rate to the muxer in case of stream copy 
Fixes Ticket3629 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 02:12:49 +01:00
Michael Niedermayer 242f1152bf ffmpeg: drop usage of coded_frame 
It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 03:06:43 +01:00
Christophe Gisquet 4c592c3908 ffmpeg: take bsf arguments from the command line 
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 13:11:34 +01:00
Michael Niedermayer 98e8a9e2f2 ffmpeg: Print a debug message if the frame parameters mismatch the context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-27 15:47:49 +01:00
Michael Niedermayer 33bc81e437 ffmpeg: skip duration cliping for passthrough & drop modes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 20:18:03 +01:00
Michael Niedermayer 4e20e94921 ffmpeg: Check duration for overlap and clip in fps cfr/vfr code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 18:36:36 +01:00
Michael Niedermayer c509202590 ffmpeg: Use input packet duration in vfr/cfr code if available and valid 
Fixes Ticket3052
 2014-11-19 18:35:40 +01:00
Michael Niedermayer 61fc1cbfbd ffmpeg: fix printed timestamp for droped frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 13:26:59 +01:00
Michael Niedermayer 9f6d48d696 ffmpeg: better CFR frame duplication selection 
This improves the handling of cases where the frame duration is not known

Fixes Ticket 4119
Fixes Ticket 1578

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 05:14:32 +01:00
Michael Niedermayer 8b43b0e8b6 ffmpeg: fix variable type for end char 
fixes warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 03:05:09 +01:00
Michael Niedermayer 9421d974bc ffmpeg: Fix last newline at log level less than "info" 
Fixes Ticket3058

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 04:25:01 +01:00
Michael Niedermayer 6ef5e29220 Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2' 
* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 13:14:33 +02:00
Michael Niedermayer 2896b98183 Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f' 
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

See: 76191c08f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:30:55 +02:00
Michael Niedermayer 9bdb7a6c1a ffmpeg: avoid endlessly reading from one input while another is unavailable 
Testcase in Ticket 4051

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 22:26:32 +02:00
Michael Niedermayer c48e8d9dca Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283' 
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 15:04:42 +02:00
Michael Niedermayer 61c6e69709 Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a' 
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
	ffmpeg.c

See: 4930cd13d6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-17 14:09:15 +02:00
Michael Niedermayer 137f7a630b Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a' 
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-15 18:56:44 +02:00
Michael Niedermayer 83f84e4c53 ffmpeg: Fix stream copy with initial_padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-14 03:30:03 +02:00