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
Derek Buitenhuis
58950ca0df
ffmpeg: Don't include colorspace.h
...
The header is private, and ffmpeg.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-29 16:44:12 -04:00
Michael Niedermayer
cc61ef0479
Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'
...
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
avconv: report the error for codec open failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-23 12:56:55 +02:00
Michael Niedermayer
d894e64acc
Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'
...
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
avconv: drop additional strerror fallback
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-23 12:56:05 +02:00
Michael Niedermayer
4abd5a4318
Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'
...
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
avconv: check that the output format context exists before accessing it
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 12:20:26 +02:00
Nicolas George
fc82f4a1f8
ffmpeg: ignore EOF when pushing frames to filters.
...
EOF is not a fatal condition, it is normally produced
by a few filters.
TODO: take it into account to avoid useless decoding.
2013-06-02 23:19:42 +02:00
Justin Ruggles
e816a8bc26
ffmpeg: use actual packet pts when discarding for the copypriorss option
...
The ist->pts value at this point does not necessarily match the actual packet
pts, which is what should be used to decide whether to discard the packet.
Without this change, some video packets that have pts on or after the start
time are getting discarded when they should not be.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-05-28 17:03:23 -04:00
Michael Niedermayer
2ad28840b3
Merge commit '538bf767373f176b6487e30181155e74b37cced6'
...
* commit '538bf767373f176b6487e30181155e74b37cced6':
avconv: make -aspect work with streamcopy
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 08:52:03 +02:00
Michael Niedermayer
1a36c756d8
ffmpeg: free threads on error conditions.
...
Fixes Ticket2562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 01:28:59 +02:00
Michael Niedermayer
33ff943f70
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Michael Niedermayer
410905f7fd
ffmpeg: use av_freep() for forced_kf_pts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Michael Niedermayer
0966623604
ffmpeg: drop old non monotone dts workaround.
...
All bugs should now be fixed in the new so the old can be droped.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 15:04:47 +02:00
Michael Niedermayer
af2d964336
ffmpeg: set correct log context for non monotone dts workaround warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 15:03:35 +02:00
Michael Niedermayer
b2a1d92b7b
ffmpeg: port loglevel selection code to new dts workaround code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 15:02:43 +02:00
Michael Niedermayer
30c05f6b02
ffmpeg: fix pts handling in the non monotone dts workaround
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 15:00:21 +02:00
Michael Niedermayer
007ee09d7c
ffmpeg: fix the used maximum dts in the monotone dts workaround
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:58:28 +02:00
Michael Niedermayer
26b89f6274
ffmpeg: use a max variable to hold the maximum dts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:57:05 +02:00
Michael Niedermayer
6b2fbdb047
ffmpeg: Check dts before use in non monotone dts workaround
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:55:20 +02:00
Michael Niedermayer
ee3824f6f6
ffmpeg: limit non monotone workaround to audio & video streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:55:12 +02:00
Michael Niedermayer
9fe2a62cc4
ffmpeg: move non monotone prevention code down
...
This moves the code to after the bitstream filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:52:37 +02:00
Michael Niedermayer
2b7f595aca
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 14:52:03 +02:00
Michael Niedermayer
22dc25cb29
Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'
...
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
avconv: improve -re implementation
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:53:08 +02:00
Michael Niedermayer
49ec4c7e49
ffmpeg: fix segfault with random output
...
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 16:01:28 +02:00
Michael Niedermayer
4818388e6c
Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'
...
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
avconv: make output -ss insert trim/atrim filters.
Conflicts:
Changelog
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:24:43 +02:00
Michael Niedermayer
76c1f9200f
Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'
...
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2':
avconv: make -t insert trim/atrim filters.
The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.
Conflicts:
Changelog
ffmpeg.c
ffmpeg_filter.c
tests/ref/fate/bethsoft-vid
tests/ref/lavf/aiff
tests/ref/lavf/asf
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/dpx
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/jpg
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/pcx
tests/ref/lavf/png
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/wav
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 14:23:52 +02:00
Nicolas George
b1cc12d0e3
ffmpeg: make -aspect work with -vcodec copy.
2013-04-18 22:59:54 +02:00
Stefano Sabatini
f6c9a325b7
ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure
2013-04-14 20:30:37 +02:00
Michael Niedermayer
835cc0f2e7
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
...
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:08:40 +02:00
Michael Niedermayer
231fd4411f
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
...
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:50:39 +02:00
Stefano Sabatini
270217908b
ffmpeg: update error message, and make use of av_err2str() to simplify
2013-04-10 18:02:00 +02:00
Michael Niedermayer
f1c0c6b7de
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: use a rational for -aspect option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:49:39 +02:00
Michael Niedermayer
6a78ec180e
ffmpeg: print frame decoding error statistic
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:47:03 +02:00
Michael Niedermayer
eedcac68f3
ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.
...
Fixes Ticket2405
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 01:40:06 +02:00
Nicolas George
de38e7c8c3
ffmpeg: use a rational for -aspect option.
2013-04-09 20:16:20 +02:00
Carl Eugen Hoyos
1c0d8f2563
Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.
...
Tested-by: Nevcairiel
2013-04-04 00:01:34 +02:00
Michael Niedermayer
356363c898
ffmpeg: Fix forcing of the framerate for stream copy on input
...
Fixes Ticket2211
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-02 18:19:23 +02:00
Michael Niedermayer
f7a02d5d69
ffmpeg: initialize got_output, this silences a compiler warning from icc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-01 20:47:48 +02:00
Michael Niedermayer
ac1a1fd708
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
...
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
Thierry Foucu
fcf73f9c01
Call do_video_stats when duplicating frame
...
When multiple frame are encoded during vsync, current code only
do_video_stats once. This need to do it every frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 12:29:12 +01:00
Michael Niedermayer
4c1f61b1e8
ffmpeg: Correct inter stream timestamp discontinuities
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 04:53:44 +01:00
Michael Niedermayer
4257b804e2
ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21 13:54:04 +01:00
Nicolas George
6a90f6d789
ffmpeg: fix freeing of sub2video frame.
2013-03-20 21:13:55 +01:00
Carl Eugen Hoyos
e4f5aa5e8d
Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.
2013-03-19 01:16:37 +01:00
Michael Niedermayer
b1a9a2c4ff
ffmpeg: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:58:10 +01:00
Michael Niedermayer
32fdfdfbda
Merge commit '354468fc12dcf93e7fb4af552e18906771913273'
...
* commit '354468fc12dcf93e7fb4af552e18906771913273':
avplay: switch to new refcounted frames API
avconv: convert to new refcounted AVFrame API
Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 14:16:02 +01:00
Nicolas George
fb14e37dd0
ffmpeg: re-enable use of buffersrc flags.
...
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
2013-03-10 14:07:29 +01:00
Nicolas George
f9b34b8bf9
ffmpeg: port sub2video to AVFrame.
...
And re-enable the FATE test.
2013-03-10 13:45:15 +01:00
Nicolas George
4e7c61b7a7
ffmpeg: do not give away our reference to the frame.
...
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
2013-03-10 01:41:50 +01:00
Michael Niedermayer
a05a44e205
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
...
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:40:35 +01:00
Michael Niedermayer
2653e12520
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
...
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:12:03 +01:00
Carl Eugen Hoyos
199db97fbd
Close output codecs if input codec initialisation fails.
...
Fixes ticket #1546 and the remaining part of ticket #1244 .
2013-03-08 02:46:46 +01:00
Michael Niedermayer
8cc5481d51
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: Deprecate the deinterlace functions in libavcodec
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07 11:50:17 +01:00
Ronald S. Bultje
2cffe38df3
Deprecate deinterlaced in libavcodec.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 21:11:48 +01:00
Michael Niedermayer
9af8179cdb
ffmpeg: fix -stats -v 0
...
Fixes Ticket1687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 19:38:13 +01:00
Michael Niedermayer
4ae74c6312
ffmpeg: print maxrss "-benchmark" data even on errors
...
Fixes Ticket2297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-02 16:04:49 +01:00
Michael Niedermayer
41401773d3
Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
...
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 12:57:17 +01:00
Michael Niedermayer
e20f2dc048
ffmpeg: fix variable name in psnr printing code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 00:25:03 +01:00
Nicolas George
f102c24d90
ffmpeg: free last sub when using -fix_sub_duration.
...
Fix trac ticket #2242 .
Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.
2013-02-27 18:57:33 +01:00
Michael Niedermayer
ad899522ff
ffmpeg: use a AVDictionary instead of the context to move swr parameters around
...
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 20:31:56 +01:00
Michael Niedermayer
6db37c9468
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
...
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:41:31 +01:00
Michael Niedermayer
c3fb20bab4
ffmpeg: Check for parameter changes at the output of the audio filter graph
...
It is currently possible that such changes leak through from the decoder as
well as a filter could generate such changes itself.
This commit blocks such changed packets unless the encoder declares support.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-14 23:56:51 +01:00
Michael Niedermayer
3b1f037df5
ffmpeg: fix streamcopy of lsf mp3.
...
Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 00:38:22 +01:00
Michael Niedermayer
127ff88639
ffmpeg: do not call exit from exit_program()
...
This should fix Ticket2116
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 04:03:52 +01:00
Stefano Sabatini
43af18ef8b
ffmpeg: implement -force_key_frames expression evalution
2013-01-27 16:56:47 +01:00
Nicolas George
41f025dff0
ffmpeg: support filtering of unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
fccd8c21c4
ffmpeg: add -guess_layout_max option.
2013-01-26 11:15:38 +01:00
Michael Niedermayer
bee044d7c2
ffmpeg: copy tmcd track timebase parameters
...
Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 18:37:32 +01:00
Michael Niedermayer
144529e094
Merge commit 'd9bf716945046333c24580d538f450b516f15710'
...
* commit 'd9bf716945046333c24580d538f450b516f15710':
ppc: vorbisdsp: Drop some unnecessary #includes
avconv: Increase the SDP buffer size to fit xiph SDPs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 14:10:32 +01:00
Nicolas George
beb5d8f07d
ffmpeg: accept "chapters" as forced key frames.
...
Allow to force a key frame at the beginning of each chapter.
2013-01-19 15:22:34 +01:00
Carl Eugen Hoyos
9a038a95d2
Use new function av_codec_get_tag2() in ffmpeg.c.
...
Fixes ticket #1953 .
2013-01-17 20:46:21 +01:00
rogerdpack
40648d8cc3
add note on windows pipe
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 17:47:49 +01:00
Stefano Sabatini
750382d5c8
ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate
2012-12-27 15:47:15 +01:00
Michael Niedermayer
af4b1c02ac
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
...
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:38:02 +01:00
Michael Niedermayer
c4a32d92fe
ffmpeg: Fix shortest with libx264
...
Encoders that buffer a significant number of frames where a "few"
frames off with -shortest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 00:08:37 +01:00
Peter Ross
c16f768d73
ffmpeg: replace magic number with VSYNC_CFR
2012-12-16 09:48:54 +11:00
Nicolas George
0f236345fb
ffmpeg: sub2video: use start and end time.
...
Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.
start_display_time was also ignored, but is it almost always 0.
2012-12-12 15:05:50 +01:00
Clément Bœsch
3b1b8f88b7
ffmpeg: small indent fix.
2012-12-04 16:40:11 +01:00
Michael Niedermayer
60c2cddff0
ffmpeg: use the correct variables in do_video_stats()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-04 16:36:09 +01:00
Thierry Foucu
e98fab1372
Update video stats log during encode flush
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-04 16:36:09 +01:00
Michael Niedermayer
66244baf1d
ffmpeg: fix mixed declarations and statements.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 03:02:11 +01:00
Michael Niedermayer
d92073ac93
ffmpeg: Correct starttime based on non discarded streams.
...
Fixes Ticket1830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 01:54:49 +01:00
Michael Niedermayer
fe97bf60b8
ffmpeg: minor simplification of wraping code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 01:34:26 +01:00
Tim Nicholson
dcbf72836c
ffmpeg: add setting of field_order flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 05:30:43 +01:00
Stefano Sabatini
3a0f3ffe8e
ffmpeg: fix weird reindent
2012-11-22 00:13:14 +01:00
Stefano Sabatini
02b4ae0427
ffmpeg: print debug_ts off and off_time values with timestamp helper routines
2012-11-22 00:13:14 +01:00
Peter Ross
9ccc349f77
ensure comment blocks that contain doxygen commands start with double asterix
...
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:55:15 +01:00
Stefano Sabatini
3d52083a27
ffmpeg: rework debugging timestamp logs in process_input()
...
Print timestamps before and after ffmpeg timestamp postprocessing.
Help to debug how ffmpeg processes the input timestamps.
2012-11-20 22:48:28 +01:00
Michael Niedermayer
9f088712d4
ffmpeg: fix double ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 02:06:50 +01:00
Michael Niedermayer
9406d6be55
ffmpeg: fix audio timestamps on stream copy with -ss
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 01:42:33 +01:00
Michael Niedermayer
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
Thierry Foucu
98cbbabadb
Fix the packet duration when flushing the encoder.
...
A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 22:29:11 +01:00
Michael Niedermayer
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
Michael Niedermayer
cd37963684
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
...
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 13:52:03 +01:00
Michael Niedermayer
1909dbf11d
ffmpeg: use av_rescale_delta() for audio stream copy
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 04:01:31 +02:00
Michael Niedermayer
a9d97e1b0a
ffmpeg: use av_rescale_delta() on the audio filter input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 00:26:35 +02:00
Michael Niedermayer
03e44bcb3f
ffmpeg: trivial simplification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 00:26:35 +02:00
Michael Niedermayer
507f2940cc
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
...
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
avconv: fix bitrate report when writing to /dev/null
avfilter: fix graphparser memleaks on error paths
rawdec: remove ff_raw_read_header
pcmdec: remove dependency from rawdec
g722: refactor out of rawdec.c
rawvideo: use a specific read_header
Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 14:24:57 +02:00
Michael Niedermayer
fa48da1ee9
ffmpeg: fix null ptr deref in psnr printing code
...
Fixes CID205005
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25 01:38:15 +02:00
Michael Niedermayer
d0ab71ed11
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
asfdec: cosmetics, reformat ff_asf_parse_packet()
g.723.1: add missing CODEC_CAP_DR1
avconv: remove now unneeded calls to avcodec_get_frame_defaults().
lavc: initialize output AVFrame before decoding.
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 14:26:13 +02:00
Michael Niedermayer
2dbc93455c
Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'
...
* commit '80521c1997a23e148edf89e11b939ab8646297ca':
build: allow targets to specify extra objects to link with executables
swscale: avoid pointless use of compound literals
libm: add fallbacks for various single-precision functions
network: use getservbyport() only if available
network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
Include sys/time.h before sys/resource.h
Conflicts:
Makefile
configure
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 12:53:26 +02:00