generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ec8e232b53
ffmpeg/doc
History
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
..
examples examples/avio_reading: remove stray empty line 2014-02-02 12:35:46 +01:00
APIchanges Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203' 2014-02-10 12:17:35 +01:00
authors.texi doc: use a common authors.texi file blurb 2012-12-19 09:33:43 +01:00
bitstream_filters.texi doc/bitstream_filters: remove mp3_header_decompress filter 2013-12-14 21:47:51 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
codecs.texi doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all 2014-01-09 12:12:10 +01:00
decoders.texi Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7' 2014-01-30 15:19:51 +01:00
default.css doc/default.css: sync with ffmpeg-web 2013-11-28 10:27:25 +01:00
demuxers.texi doc/demuxers: fix image2 examples 2013-09-29 16:36:25 +00:00
developer.texi Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e' 2013-12-23 12:52:50 +01:00
devices.texi doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all 2014-01-09 12:12:10 +01:00
doxy-wrapper.sh doc/doxy-wrapper: disable inserting headers and footers 2013-11-10 02:33:33 +01:00
Doxyfile Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
encoders.texi libfdk-aacenc: disable hard version requirements 2014-02-06 02:33:33 +01:00
errno.txt
faq.texi doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry 2014-01-03 17:05:44 +01:00
fate_config.sh.template Merge remote-tracking branch 'qatar/master' 2013-05-29 11:19:25 +02:00
fate.texi Merge remote-tracking branch 'qatar/master' 2013-07-28 14:21:11 +02:00
ffmpeg-bitstream-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-codecs.texi doc: move ffmpeg-codecs.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-devices.texi doc: move ffmpeg-devices.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-filters.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-formats.texi doc: move ffmpeg-formats.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-protocols.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-resampler.texi Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
ffmpeg-scaler.texi Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
ffmpeg-utils.texi doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi 2013-04-12 18:21:57 +02:00
ffmpeg.texi doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options 2014-01-24 12:20:46 +01:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 2014-02-10 13:26:31 +01:00
ffprobe.texi doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all 2014-01-09 12:12:10 +01:00
ffprobe.xsd ffprobe: show best_effort_timestamp in the frame section 2013-12-15 10:46:46 +01:00
ffserver.conf ffserver: add stream Metadata option 2013-12-16 19:18:45 +01:00
ffserver.texi doc/ffserver: mention how to access streams through RTSP 2014-01-03 17:03:43 +01:00
fftools-common-opts.texi Allow hiding the banner. 2013-12-29 22:57:20 +01:00
filter_design.txt doc/filter_design.txt: Fix duplicate words 2013-08-12 19:40:29 +02:00
filters.texi Fix a few heigth/height typo. 2014-02-07 09:33:56 +01:00
formats.texi lavf: add output_ts_offset option to AVFormatContext 2014-02-02 13:16:17 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2014-02-08 19:02:46 +01:00
git-howto.texi doc: git-howto: Leave reviewers time to react before pushing patches 2012-11-11 20:43:28 +01:00
indevs.texi lavd/pulse_audio_dec: apply cosmetic changes 2013-10-18 23:26:55 +02:00
issue_tracker.txt doc/issue_tracker: add 2 missing issue types 2013-10-26 11:29:42 +02:00
libavcodec.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavdevice.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavfilter.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavformat.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavutil.texi doc/libavutil: add things from avutil.txt 2013-11-14 09:51:10 +01:00
libswresample.texi Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
libswscale.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
Makefile examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
metadata.texi doc/metadata: add notes and examples regarding metadata usage with ffmpeg 2013-06-11 01:07:16 +02:00
mips.txt libavcodec: Implementation of 32 bit fixed point FFT 2013-08-04 14:01:41 +02:00
multithreading.txt Merge commit '759001c534287a96dc96d1e274665feb7059145d' 2013-03-12 03:23:28 +01:00
muxers.texi doc/muxers: add "Options", "Examples", "Syntax", etc. subsections 2014-01-19 13:40:37 +01:00
nut.texi Drop Snow codec 2013-01-06 16:30:02 +01:00
optimization.txt Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
outdevs.texi lavd: add decklink output device 2014-02-09 17:15:19 +01:00
platform.texi doc/platform: Update to reflect current MSVC build situation 2013-11-27 13:39:42 +00:00
print_options.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
protocols.texi lavf/libssh: add private_key option 2014-01-22 00:41:13 +01:00
rate_distortion.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
RELEASE_NOTES Prepare release notes for Libav 10 "Eks" 2013-12-18 09:18:42 -05:00
resampler.texi doc: add a few links to the Channel Layout syntax section 2013-10-25 15:44:12 +02:00
scaler.texi doc: move sws_dither option description to scaler.texi 2013-09-30 16:54:46 +02:00
snow.txt doc/snow: add gray/alpha/gbr 2013-08-29 22:52:04 +02:00
swresample.txt Fix a few "its" vs "it's" typo. 2013-02-14 23:45:48 +01:00
swscale.txt x86: mmx2 ---> mmxext in comments and messages 2012-10-31 00:37:42 +01:00
t2h.init doc/default.css + doc/t2h.init: New styles 2013-10-09 04:01:46 +02:00
tablegen.txt
texi2pod.pl doc/texi2pod: make references bold 2014-02-06 16:18:26 +01:00
texidep.pl doc: add script to compute texi files dependencies 2013-12-06 10:40:38 +01:00
utils.texi cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00