Michael Niedermayer
6fb8684a24
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
...
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
avplay: add support for seeking to chapter marks
Conflicts:
doc/ffplay.texi
ffplay.c
ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-10 13:26:31 +01:00
Michael Niedermayer
2e99867a4e
Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'
...
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-10 12:17:35 +01:00
Anton Khirnov
b36bc81cca
avplay: add support for seeking to chapter marks
2014-02-10 11:23:01 +01:00
Anton Khirnov
d711d839ca
doc/APIchanges: fill in missing hashes and dates
2014-02-10 07:29:27 +01:00
Anton Khirnov
cca4742a5e
doc/APIchanges: mark the place where 9 was branched
2014-02-10 07:29:27 +01:00
Ramiro Polla
5965adeb20
lavd: add decklink output device
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-09 17:15:19 +01:00
Michael Niedermayer
0c4bf87b29
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08 19:02:46 +01:00
Kostya Shishkov
cde7df25ef
Mirillis FIC video decoder
...
Does not contain cursor rendering yet.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-08 15:04:13 +00:00
Clément Bœsch
f21d0beb0c
Fix a few heigth/height typo.
2014-02-07 09:33:56 +01:00
Timothy Gu
474db7a696
doc/texi2pod: make references bold
...
Inspired by GCC r86635.
This is more consistent with other man pages. For example in `man git`,
all the "git-help(1)" kind of cross refs are bold.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-06 16:18:26 +01:00
Timothy Gu
4a37e2977c
libfdk-aacenc: disable hard version requirements
...
Enable compilation on machines with an old libfdk-aac.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-06 02:33:33 +01:00
Michael Niedermayer
3adb5f8d8b
Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
...
* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
lavf: improve handling of sparse streams when muxing
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 37ed5df5c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-05 03:19:22 +01:00
Luca Barbato
d9ae1031f5
lavf: improve handling of sparse streams when muxing
...
Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.
Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.
Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.
Original report of the issue and initial proposed solution by
mus.svz@gmail.com .
Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-04 22:01:42 +01:00
Michael Niedermayer
905cd28a5a
Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
...
* commit 'de203abd71baae7f120313259b45cf935c85203e':
vf_overlay: add eof_action switch
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04 14:33:33 +01:00
Keith Lawson
de203abd71
vf_overlay: add eof_action switch
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-04 10:54:26 +01:00
Jean First
2384cada12
lavfi/ebur128: add true peak metering per frame
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:45:09 +01:00
Jean First
6ef2315aaf
lavfi/ebur128: print peak metering in dBFS
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:45:09 +01:00
Clément Bœsch
7f42bfad5d
lavfi/ebur128: add sample and true peak metering.
...
Metadata injection and logging. Not yet present visually.
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:44:56 +01:00
Stefano Sabatini
bf96e547b7
doc/APIchanges: fix weird reindent
2014-02-02 13:16:28 +01:00
Stefano Sabatini
5871ee5072
lavf: add output_ts_offset option to AVFormatContext
...
This option can be generally useful to set an output offset, needed when
setting an absolute index in the output.
2014-02-02 13:16:17 +01:00
Stefano Sabatini
60251c13e3
examples/avio_reading: remove stray empty line
2014-02-02 12:35:46 +01:00
Stefano Sabatini
5fc4dea39c
examples: add avio_reading.c example
2014-02-02 11:58:23 +01:00
Stefano Sabatini
a270f63e83
lavfi/overlay: add yuv422 format mode
2014-02-02 11:50:21 +01:00
Michael Niedermayer
a85a718f26
doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns
...
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 03:27:37 +01:00
Stefano Sabatini
4111856545
doc/APIchanges: apply minor formatting fixes
2014-01-31 00:48:31 +01:00
James Darnley
9a6d91b6b6
Changelog: add entries relating to metadata_header_padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 20:37:07 +01:00
Michael Niedermayer
6dc9d2cf47
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 16:00:47 +01:00
Michael Niedermayer
d85284d4aa
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
...
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See: 5e45f03420
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 15:19:51 +01:00
John Stebbins
64ba831da9
doc: document correct option to list encoders
2014-01-29 23:27:37 +01:00
John Stebbins
a17ab0e46a
doc: add decoders.texi
...
Only documents ac3 decoder options at this point.
2014-01-29 23:27:18 +01:00
Lukasz Marek
406cb21b63
doc/general: update device and protocol status
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 17:58:22 +01:00
Lukasz Marek
4115cd0e76
doc/APIchanges: add avdevice_*_control_message functions
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 15:30:45 +01:00
Lukasz Marek
ded6b3af41
lavd: add opengl device
...
It can render to OpenGL context provided by application or into SDL window
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-27 15:18:18 +01:00
Stefano Sabatini
68c5ba1f05
doc/filters: re-edit notes on filtergraph escaping
...
State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.
Should fix trac issue #3334 .
2014-01-26 18:06:39 +01:00
Lars Kiesow
c49b036096
Documentation for scale filter factor
2014-01-25 15:34:23 +01:00
Ramiro Polla
78a9f185eb
lavfi/drawtext: add option for drawing border around text
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d
lavfi/drawtext: get bitmap from glyph in a separate step
...
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:46:38 +01:00
Stefano Sabatini
ca57659440
examples/filtering_audio,video: do not call avcodec_register_all()
...
It is implied by av_register_all(). Simplify.
2014-01-24 12:20:46 +01:00
Stefano Sabatini
433b153b68
doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options
...
Avoid doc duplication and desynching.
2014-01-24 12:20:46 +01:00
Stefano Sabatini
35fe88bb51
examples/muxing: reindent after previous commit
2014-01-23 01:08:24 +01:00
Stefano Sabatini
c92d2f98db
examples/muxing: flush encoders at the end
2014-01-23 00:54:33 +01:00
Lukasz Marek
7e8f304846
lavf/libssh: add private_key option
...
Allows to specify private key to use during authorization.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-01-22 00:41:13 +01:00
Stefano Sabatini
b539a72bba
examples/filtering_audio,video: drop call to avcodec_get_frame_defaults()
...
The avcodec_get_frame_defaults() function is deprecated and its use
doesn't seem required.
2014-01-21 20:08:36 +01:00
Stefano Sabatini
e34ad128a3
examples/muxing: reduce duration, remove wrong and misleading comment
...
Set duration to 10 seconds, after it was increased from 5 to 200 seconds
in 8d80f3cb87
.
200 seconds will generate too much data which is annoying especially when
testing.
2014-01-21 11:52:14 +01:00
Michael Niedermayer
eef74b2e97
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:55:22 +01:00
Stefano Sabatini
9ab8f3738a
examples/muxing: remove redundant {}
2014-01-20 13:10:10 +01:00
Stefano Sabatini
b933c72b5e
examples/muxing: change error checks, from "ret != 0" to "ret < 0"
...
More consistent and more future-proof.
2014-01-20 13:10:10 +01:00
Stefano Sabatini
d72c742d47
examples/muxing: factorize write_interleave code
...
Also log output packet information.
2014-01-20 13:10:10 +01:00
Stefano Sabatini
5e2b8e4934
examples: add remuxing example
...
Show how to perform streamcopy from one container to another.
2014-01-20 13:10:10 +01:00
Anton Khirnov
93c553c71e
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
2014-01-20 12:52:28 +01:00