Michael Niedermayer
7d03732f7e
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
01c17b5224
ffmpeg: Fix copying timebase to muxer context
...
Fixes Ticket3741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8bbadc9b6e
ffmpeg: Use av_stream_get_parser() to avoid ABI issues
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
59975de777
ffmpeg: fix integer overflows with sub->*display_time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9098f0ecd7
ffmpeg: remove common factors from copied timebase
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4930cd13d6
ffmpeg: check av_opt_set_dict() return
...
Fixes CID1224275
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Sergey
6d2df3c00a
ffmpeg: fix deadlock regression in threading error handing
...
Commit fc9c857c
introduced deadlock regression when processing too many inputs:
ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null -
Happens for different number of inputs, depending on available memory size,
overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds,
that exhaust address space allocating 8-10 MB stack for each thread.
Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message.
This patch fixes both problems: it frees the queue to prevent deadlock
and adds a meaningful error message if pthread_create() fails.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c69f729947
ffmpeg: fix reinitializing with threads while flushing
...
With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost
This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time
Fixes hqx fate with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anshul Maheshwari
7e6cf36453
ffmpeg: fix transcoding dvbsub to dvbsub
...
fix ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anshul Maheshwari
3639343478
ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5ded0b390b
ffmpeg: for h264 we need has_b_frames from the decoder
...
Other solutions welcome
Fixes Ticket3711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
378ad22492
ffmpeg: print values of mismatching has_b_frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
10012fa961
ffmpeg: Fix bitstream filters manipulating AVCodecContext
...
Fixes Ticket3715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
27856b2fe9
ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy
...
Fixes Ticket3658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lou Logan
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
137c5e115b
ffmpeg: try to use the more fitting of the 2 encoder contexts
...
This fixes the interactively enabled encoder debug by pressing 'D'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
576654302b
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
11 years ago
Michael Niedermayer
2422a7ffe4
Loose mplayer in MPlayer/incoming/
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3e7b4b9fbd
Add direct link to ML in missing_feature_sample()
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
768ef0f19e
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
...
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a0b2de77ed
ffmpeg: remove "has_b_frames" backpassing
...
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
00dcb10631
ffmpeg: Fix encoder names in printout
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0949bbc431
ffmpeg: fix for-muxer AVCodecContext stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a87685d8e8
ffmpeg: add note about why has_b_frame is copied and when it can be removed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
921d5ae3bc
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9fb45334fc
ffmpeg: copy b frame codec delay back from decoder to demuxer
...
The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b3f4615081
ffmpeg: fix check for muxing overhead being unknown
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas George
fc9c857c2d
ffmpeg: use thread message API.
11 years ago
Michael Niedermayer
1f359c8559
ffmpeg: use av_stream_get_end_pts()
...
Simplifies code and should correct timing values when -*sync drop is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b2a8bc3d04
ffmpeg/set_encoder_id: dont allocate encoder string if one is already set
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
4d686674b2
ffmpeg: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Michael Niedermayer
833ec9177d
ffmpeg/do_video_stats: fix used timebase
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dad54e4a62
ffmpeg: set dts for subtitles
...
dts is not optional, its required for muxing,
previously it was set from AVStream.pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
87f5ede6b5
ffmpeg: add last_mux_dts_plus_duration
...
Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Olivier Langlois
76191c08f8
ffmpeg: Use av_gettime_relative()
...
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0c152fe916
ffmpeg: prefix encoder with "Lavc " in bitexact mode
...
This avoids misleading encoder names like "encoder = prores"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bbee02ed9c
ffmpeg: Skip writing the version when -flags bitexact is used
...
Alternatively every fate test could be changed to pass both fflags and flags +bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e9602dcb4d
ffmpeg: bitstream filters require split out side data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
a5f2f33a67
ffmpeg: use av_fifo_freep
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Michael Niedermayer
a3477fef2b
ffmpeg: put the sizeof() second in av_malloc_array()
...
This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
feaa31d354
ffmpeg: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ed72dae4cf
ffmpeg: dont print "Conversion failed" if conversion has never started
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fed0acebad
ffmpeg: print an error at the end if conversion failed
...
Fixes Ticket3477
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e48fb4e1a5
ffmpeg: fix mixed merged & split side data with the stream->packet hack
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
517cc81e93
ffmpeg: stop protocols on interrupt when no transcoding has happened yet
...
Fixes Ticket3344
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
506064ed10
ffmpeg: frame droping due to fps should not be a warning
...
This reverts part of 41e7e46cac
See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb640eb335
ffmpeg: move packet deallocation into write_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas George
521707d42e
ffmpeg: sub2video: send a last blank frame before closing.
...
Fix trac ticket #3420 .
11 years ago
Michael Niedermayer
9dca02ee54
ffmpeg: dont call exit_program() from a signal hander
...
This is unsafe and can deadlock amongth other things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d3ed8a4d2b
ffmpeg: try to avoid calling av_log() from sigterm_handler()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago