e3d4784eb3
d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
2015-09-17 10:33:21 +02:00
03f34e0d3c
doc/filters: ladspa: add two more examples, this time using SWH plugins
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
b290972b8f
lavf: Switch probesize and max_analyze_duration to 64bit.
...
Both are only accessible through AVOptions.
2015-09-15 18:02:51 +02:00
c311713ca9
lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.
...
Based on a patch by Steve Swanson, swanysteve at gmail.
Fixes ticket #2089 .
2015-09-15 18:02:47 +02:00
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
2015-09-15 18:02:43 +02:00
28e023377c
doc/filters: mention newly added windowing functions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 15:23:39 +00:00
b0f9856616
avfilter: add stereowiden filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 09:34:22 +00:00
39c61d8459
avfilter: add audio limiter filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-12 13:29:20 +00:00
a0a2ca024b
avfilter/af_ladspa: support simpler syntax for controls
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-12 13:07:55 +00:00
1bf7bd194b
avfilter: add ocr filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-12 02:14:44 +00:00
98ecee2d3d
doc/filters: fix Photoshop curves file extension
...
Found-by: moorej
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-09-10 14:13:23 -08:00
7277a4ace9
avformat/http: add reconnect_delay_max option
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-09 02:23:38 +02:00
6bda0f6638
doc/protocols: Fix usefull typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-09 00:17:59 +02:00
e25f192d6b
doc/encoders: add libopenh264 entry
2015-09-08 17:54:16 +02:00
51c5e924b9
doc/codecs: extend documentation for the threads option
2015-09-08 17:54:09 +02:00
106cab1152
doc/codecs: mention GOP in the g option
...
This helps when grepping for "gop".
2015-09-08 17:54:03 +02:00
151aa2ebff
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
...
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08 16:35:28 +02:00
f53569a93f
Merge commit '6b3ef7f080293956b2e5212b83135c6b051212e9'
...
* commit '6b3ef7f080293956b2e5212b83135c6b051212e9':
lavu: Remove bit packing from AVComponentDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08 14:53:34 +02:00
c734b34b04
Merge commit 'b8b5d8274471129f122858bc74ad09284dae6ab7'
...
* commit 'b8b5d8274471129f122858bc74ad09284dae6ab7':
lavu: extend size of the AVPixFmtDescriptor.flags field
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-08 14:53:13 +02:00
b31041adc3
avfilter: add extrastereo filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-08 10:43:17 +00:00
9bd68dea2b
avformat/http: Add reconnect_at_eof and reconnect_streamed options
...
They allow reconnecting endless live streams which fail with eof
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-07 19:26:43 +02:00
d02d208211
Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b'
...
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
DXV decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-07 16:07:07 +02:00
2268db2cd0
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
...
The new fields can be accessed directly and are more intelligible.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-07 12:37:47 +02:00
6b3ef7f080
lavu: Remove bit packing from AVComponentDescriptor
...
There is no practical benefit in having this structure elements
bit packed given the size of the structure and its usage.
Change types from uint16_t (packed) to plain int in order to simplify
modifying the structure and accessing its fields.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-07 12:36:56 +02:00
b8b5d82744
lavu: extend size of the AVPixFmtDescriptor.flags field
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-07 12:36:04 +02:00
50d9121afc
doc/filters:vf_stereo3d: update to recent changes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-06 11:55:13 +00:00
09812e1200
avfilter/vf_stereo3d: add checkerboard output format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-06 11:49:03 +00:00
e855ed17a7
Update md5 muxer docs to indicate that it ignores timestamps.
2015-09-06 15:07:19 -04:00
a388ca359d
avfilter/sine: support expression in the number of output samples
2015-09-06 15:28:21 +02:00
d9464e9c14
doc/examples/demuxing_decoding: simplify api_mode to refcount
...
This finalizes the quick cleanup of a753e6c9f5
2015-09-06 12:35:00 +02:00
160e92c8bf
Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249'
...
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249':
Bump major versions of all libraries
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-05 21:35:46 +02:00
0acd4e75fd
doc/APIchanges: Fill in missing fields and correct one lavu version
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05 18:25:24 +02:00
982e235d76
doc/APIchanges: add 2.8 cut line
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05 18:25:24 +02:00
a753e6c9f5
doc/examples/demuxing_decoding: Drop old api mode, because the code fails to build otherwise
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05 18:25:24 +02:00
144fb06806
Remove left-over FF_API_AVFILTERBUFFER cruft
2015-09-05 16:27:19 +02:00
55886c67e7
avfilter/vf_waveform: change intensity to float
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-04 17:14:32 +00:00
e9c58033e8
doc/examples/http_multiclient: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-04 11:30:25 +02:00
3cf0c959cd
doc: Explain how to use the fps and the fieldmatch filter together.
...
Fixes ticket #3968 .
2015-09-03 14:36:34 +02:00
8d2b4b8c82
avfilter/vf_drawgraph: add rscroll slide mode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-03 09:12:14 +00:00
19dfbe9298
avfilter/vf_elbg: make it possible to output to pal8 pixel format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-03 09:12:06 +00:00
c45fcf30cf
DXV decoder
...
Support all DXDI and DXD3 normal quality videos.
2015-09-02 22:22:02 +02:00
26a0cd1b4b
lavf: add V as a video stream specifier which is not an attached picture
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-09-02 21:35:21 +02:00
9dbc50b4cd
avfilter/vf_subtitles: allow setting fonts directory
...
This is mostly useful if libass was compiled with a font provider
other than fontconfig, but is still useful in that case.
Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
2015-09-02 00:47:52 +02:00
32f217edad
avfilter/vf_waveform: implement various filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-01 08:43:34 +00:00
a902bebdab
doc/filters: mention all short names for vectorscope options
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-30 08:35:02 +00:00
7516aa9a4a
avfilter/vf_vectorscope: implement envelope support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-30 08:34:05 +00:00
4bd99f715d
avcodec/snowenc: Support setting the iterative dia size separately
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-30 04:23:30 +02:00
16229fae9c
avfilter/vf_vectorscope: add yet another mode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-29 14:05:03 +00:00
b48d8fa3ac
avfilter: add allrgb
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Clément Bœsch <u@pkh.me>
2015-08-29 14:57:52 +02:00
e88103a7f9
Bump major versions of all libraries
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-08-28 16:04:28 +02:00
53bf32fa42
doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the filters
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-28 12:53:35 +02:00
15f4b3db58
avfilter: add framerate video filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-27 20:00:36 +00:00
da0e76955a
ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels
2015-08-26 18:46:20 -07:00
319440e54f
avfilter: add hstack & vstack filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-26 11:16:51 +00:00
c23999be13
avconv_opt: Add an option that lists all supported hwaccels
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-26 05:18:43 +02:00
2157df425b
hlsenc: Support outputting specific versions
...
Right now only version 2 and version 3 are supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-25 19:43:58 +02:00
c34c050303
avfilter/vf_vectorscope: make intensity user configurable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-24 14:19:30 +00:00
14f97bb2bc
avfilter: add waveform monitor filter
2015-08-22 19:48:42 +00:00
5dee7a32d7
git-howto: Various copy edits
2015-08-22 09:16:20 -07:00
e32a99264b
Add support for Audible AA files
...
https://en.wikipedia.org/wiki/Audible.com#Quality
2015-08-21 04:24:58 +00:00
4e8963fa38
avfilter: add video vectorscope filter
2015-08-20 22:57:47 +00:00
538ea9a209
doc/indevs: Remove non-existent decklink option examples
...
Forgotten in c5d0148
2015-08-20 10:34:18 -08:00
4918726d41
doc/indevs: add various missing options
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
2015-08-19 10:34:24 -08:00
2fa019958b
avfilter: add showfreqs filter
2015-08-19 16:15:13 +00:00
babd340f58
vaapi: streamline public context structure.
...
Move libavcodec managed objects from the public struct vaapi_context
to a new privately owned FFVAContext. This is done so that to clean up
and streamline the public structure, but also to prepare for new codec
support, thus requiring new internal data to be added in there.
The AVCodecContext.hwaccel_context, that holds the public vaapi_context,
shall no longer be accessed from within vaapi_*.c codec support files.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2015-08-19 14:03:24 +02:00
9f8e57efe4
vaapi: define a unique pixel format for VA-API (AV_PIX_FMT_VAAPI).
...
Deprecate older VA pixel formats (MOCO, IDCT) as it is now very unlikely
to ever be useful in the future. Only keep plain AV_PIX_FMT_VAAPI format
that is aliased to the older VLD variant.
This is an API change.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2015-08-19 14:03:24 +02:00
fa95965f5a
avfilter/vf_histogram: make it possible to pick color components for levels mode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-19 10:05:33 +00:00
5d410a1db2
doc/indevs: fix fbdev typos
...
Fixes ticket #4784 as found by rodarmor.
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2015-08-18 13:14:57 -08:00
21566b21d5
avfilter: add scale2ref filter
...
This filter can be used to scale one stream to match another or based on
another, useful to scale subtitles or other things to be overlayed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-17 17:18:01 +02:00
31d6f8de53
doc/filter_design: Remove reference to the deprecated and unused cur_buf_copy
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-16 11:46:33 +02:00
767d780ec0
doc/examples: rename avio_list_dir -> avio_dir_cmd
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-16 02:16:47 +02:00
c84d208c27
examples/avio_list_dir: add move and delete methods
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-15 03:32:38 +02:00
4b0e112442
avfilter/avf_avectorscope: add polar mode
2015-08-14 17:27:56 +02:00
90f5668323
doc/demuxers/mpegts: apply a minor grammar fix to option description
...
Consistently use impersonal form.
2015-08-14 12:08:57 +02:00
819dc7aa0b
doc/demuxers/mpegts: update documentation
...
The description is yet crappy, it merely copies the description of the
added and undocumented options and their value range. More descriptive
documentation is welcome.
2015-08-14 12:08:57 +02:00
5fec7942bf
doc/developer: Suggest everyone to help with patch reviews
...
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: compn <tempn@mi.rr.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-13 19:49:11 +02:00
f9905e13ea
avfilter: add aphasemeter filter
2015-08-12 22:27:43 +02:00
8b63a88494
doc/ffmpeg,doc/ffplay: reference timespec definitions
...
Reference time definition syntax in option descriptions when appropriate.
Fixes trac ticket #4595 .
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-08-12 11:52:40 +02:00
92a4bda95b
doc/ffmpeg: correct minor typo
...
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11 14:39:23 +02:00
8623aba043
doc/codecs: Document color_range for the input side
...
Partly fixes Ticket 443
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11 03:58:00 +02:00
c5ebeaa308
swscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARD
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-09 17:11:53 +02:00
d0e0757e9a
swscale: Implement alphablendaway for planar 4:4:4 formats
...
Fixes Ticket4746
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-08 13:24:52 +02:00
2bdd026b26
avfilter/avf_avectorscope: stop making output fully transparent
2015-08-07 16:44:19 +02:00
3f87a17063
avcodec/dvbsubdec: Allow selecting the substream, or all substreams
...
Fixes Ticket 2161
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-04 14:24:13 +02:00
2ca0ed9cfd
doc/git-howto: Replace "git push" example by one with dry-run
...
I do not think having "git push" as example is a good idea.
The command has a very high chance of pushing things which are unwanted to be
pushed
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-03 19:33:46 +02:00
5b69fb783e
avfilter: add atadenoise
2015-08-02 18:19:19 +02:00
49a14a7616
avfilter: add allyuv source filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-02 14:13:59 +02:00
3cf08e96fc
Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'
...
* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
des: add av_des_alloc()
Conflicts:
libavutil/des.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02 10:41:16 +02:00
9ca19971bc
Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'
...
* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
xtea: add av_xtea_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02 10:39:37 +02:00
a130ec9540
Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'
...
* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
rc4: add av_rc4_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02 10:38:33 +02:00
9ed59f16e0
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
...
* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
blowfish: add av_blowfish_alloc()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02 10:38:12 +02:00
25410c524d
doc/example: Add http multi-client example code
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
2015-08-01 00:58:32 +02:00
1d46e0ee05
doc/protocols: document experimental mutli-client api
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
2015-08-01 00:58:31 +02:00
d9e8b47e31
des: add av_des_alloc()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-31 09:04:12 +02:00
5d8bea3bb2
xtea: add av_xtea_alloc()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-31 09:04:12 +02:00
ae365453c3
rc4: add av_rc4_alloc()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-31 09:04:12 +02:00
7a7df34c91
blowfish: add av_blowfish_alloc()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-31 09:04:09 +02:00
d560c61125
Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'
...
* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
hmac: add missing version bump and APIChanges entry
Conflicts:
libavutil/version.h
version.h is not changed as the code has been added 2 years ago in FFmpeg
See: 82ef67016e
2015-07-30 18:37:05 +02:00
6877537ff3
hmac: add missing version bump and APIChanges entry
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-30 16:40:26 +03:00
363995296f
doc/APIchanges: fill in some missing things
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-30 03:09:04 +02:00
42209eb955
doc/ffmpeg: Use @code
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29 18:58:40 +02:00
f4ada6dc3f
ffmpeg: Implement support for seeking relative to EOF
...
Fixes Ticket227
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29 17:16:51 +02:00
e3ec2cde2c
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'
...
* commit 'b94ec30428b9696f99b08055735689623fe63954':
lavc: Update version and APIchanges
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 23:21:23 +02:00
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 23:15:19 +02:00
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
lavc: AV-prefix all codec capabilities
Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:50:18 +02:00
94d68a41fa
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
...
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
lavc: AV-prefix all codec flags
Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:10:35 +02:00
b94ec30428
lavc: Update version and APIchanges
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:26:57 +01:00
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:59 +01:00
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:58 +01:00
7c6eb0a1b7
lavc: AV-prefix all codec flags
...
Convert doxygen to multiline and express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:58 +01:00
4b6b1082a7
lavc: Deprecate avctx.me_method
...
This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:56 +01:00
6d3081e6c3
doc: Remove the now unnecessary remark about PATH and link.exe
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-27 10:44:31 +03:00
4a2836eaf3
avfilter: add acrossfade filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-26 21:54:13 +00:00
46f01e4133
Merge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc'
...
* commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc':
doc: Remove the now unnecessary remark about PATH and link.exe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 12:50:10 +02:00
33c4fc0a2d
doc/decoders: Add entry for dvbsub and document compute_clut
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 00:06:43 +02:00
c1fa846d0c
avfilter: add sidechain compress audio filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-25 22:07:20 +00:00
591741b51d
avfilter: add areverse filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 02:06:48 +00:00
e59315c4ab
doc/filters.texi: fix two typos in reverse filter description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-23 07:35:54 +00:00
52c75d486e
lavc/hevc: rudimentary support for skip_loop_filter.
...
+~9% speed on Core i5 on test sample.
All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html
2015-07-23 16:26:14 +02:00
9e3135f49e
Edit documentation and versioning for the fixed point AAC decoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 23:25:33 +02:00
c40ecffd31
Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS
...
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data
AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 19:31:52 +02:00
787d370e14
avfilter: add deband filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-22 15:52:02 +00:00
d2b78fe6b7
libavfilter/vf_crop: implement process_command
...
Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 19:19:36 +02:00
99ad832c7e
libavfilter/vf_scale: implement process_command
...
Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 18:20:22 +02:00
be0fd07457
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
...
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
parseutil: Use non ambiguous aliases for uhd
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 16:55:39 +02:00
219b39a71a
parseutil: Use non ambiguous aliases for uhd
...
uhd1 and uhd2 would be ambigous.
2015-07-21 11:43:44 +02:00
e5bae39f46
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
...
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
Add a quality factor packet side data
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 00:54:42 +02:00
5d3addb937
Add a quality factor packet side data
...
This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:47 +01:00
9ebe041e1c
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
...
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 04:32:28 +02:00
e93ca480c9
parseutil: Add more resolution aliases
...
Add DCI 2k and 4k and uhd1 and uhd2.
2015-07-20 04:05:48 +02:00
a8fbb7b625
avfilter: add random video filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-19 19:01:00 +00:00
0a551cbe97
Add support for Audible AAX (and AAX+) files
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 20:28:39 +02:00
8271a84094
avfilter: Add reverse filter
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-07-19 14:13:51 +01:00
b5e716ae13
avformat/mpegtsenc: Add sdt_period, similar to pat_period
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 23:26:05 +02:00
34da54fd1a
avformat/mpegtsenc: Support a user specified PAT/PMT period
...
Can be used to fix Ticket3714
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 22:24:25 +02:00
a9c1545a33
avformat/mpegtsenc: support storing PAT/PMT per frame
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 22:19:19 +02:00
e3e4f1752c
doc/developer: add url for sample files
...
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 21:20:34 +02:00
f477a3f5ab
avformat/async: support filling with a background thread.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 01:46:50 +02:00
297df52f30
avfilter/af_compand: fix clipping with default options
...
Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.
Reported-by: lachs0r
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-17 11:29:29 +00:00
21436b95dc
avfilter: add Dynamic Audio Normalizer filter
2015-07-17 10:58:24 +00:00
3b365dda5c
avfilter/af_astats: measure minimal and mean difference between two consecutive samples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-17 09:30:03 +00:00
a53540840d
APIchanges: Mention lavfi and lavd identification symbol addition
2015-07-17 01:44:22 +01:00
5117b5e9aa
concatdec: add support for injecting packet metadata
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
25a6711c25
concatdec: add support for specifying outpoint of files
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
7ff0137a1f
concatdec: add support for specifying inpoint of files
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-07-17 00:12:04 +02:00
59a9998908
avfilter/af_astats: also measure maximal difference between two consecutive samples
...
While here also mention bit depth in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 19:09:57 +00:00
8dad213143
lavc: Add properties field to AVCodecContext.
...
The new field can hold information about losslessness and closed captions for now.
2015-07-16 12:18:30 +02:00
3001558487
avfilter: add erosion, dilation, deflate & inflate filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-15 13:21:47 +00:00
b90b6af710
avcodec: add libkvazaar HECV encoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 18:00:36 +02:00
6727380d05
Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'
...
* commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043':
doc: add a section about building with libmfx
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:23:16 +02:00
a9a2f36130
doc: add a section about building with libmfx
2015-07-12 18:15:39 +02:00
8d4460f1bb
Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'
...
* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949':
doc: Use the succinct syntax for the channelmap example
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 12:11:10 +02:00
8fcd121b82
doc: Use the succinct syntax for the channelmap example
...
Mixing succinct and long syntax does not work.
2015-07-09 00:09:53 +02:00
91748662bc
avfilter: add removegrain
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-08 16:02:34 +00:00
e43ea1cbb2
doc/texi2pod: fix an unescaped left brace
...
This silences some deprecation warnings
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-05 19:02:48 -03:00
e658b1036c
avfilter/avf_showvolume: make it possible to use current channel number in color expression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-03 18:43:21 +00:00
c3a5702ebf
lavfi: add (a)drawgraph filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-03 18:43:21 +00:00
d563e13a7c
Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
...
* commit '832129431fd5c693b12c32a1563944c631feaf36':
lavu: Add version information for av_version_info()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 21:06:46 +02:00
d3836b603e
avfilter/af_astats: export metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-03 16:34:28 +00:00
832129431f
lavu: Add version information for av_version_info()
...
Move the APIchange entry at the top.
2015-07-03 14:30:11 +01:00
e15e78f391
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
...
* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
lavu: add an API function to return the Libav version string
Conflicts:
.gitignore
Makefile
cmdutils.c
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c
See: f91126643a
2015-07-03 03:22:48 +02:00
1316df7aa9
lavu: add an API function to return the Libav version string
...
This returns something like "v12_dev0-1332-g333a27c". This is much more
useful than the individual library versions, of which there are too
many, and which are very hard to map back to releases or git commits.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2015-07-02 23:22:53 +02:00
8cbce1001d
doc/muxers/segment: fix formatting of segment_list_type option
...
Place @item entry at the right point, remove duplicated description.
2015-07-02 11:06:23 +02:00
f91126643a
lavu: add an API function to return the FFmpeg version string
...
This returns something like "N-73264-gb54ac84". This is much more useful
than the individual library versions, of which there are too much and
which are very hard to map back to releases or git commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:58:05 +02:00
68939f7682
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
...
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
Go2Meeting decoder
Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:18:30 +02:00
08c2d8f0aa
Go2Meeting decoder
...
ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-01 01:08:15 +02:00
04a68f4348
avcodec/h264: Greenmetadata SEI parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 23:20:36 +02:00
e97ec65630
doc: Add jpeg2000 encoder documentation.
2015-06-30 15:00:38 +02:00
9842d6707f
avfilter/avf_showvolume: optionally display channel names
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-29 07:53:56 +00:00
da8b228977
avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace
...
This was suggested in the discussion about these functions
With this change the functions are available internally but are not
part of the public API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-29 16:30:43 +02:00
21cede9e97
doc/filters: fix documentation bug in ssim filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-28 21:35:19 +00:00
f76d7d4b01
avfilter: add showvolume filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-28 14:33:36 +00:00
388a6f581a
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-25 19:29:02 +02:00
5a1f785249
avfilter: add ssim filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-24 14:04:40 +00:00
5a79bf0284
PCM signed 16-bit big-endian planar decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-24 14:45:00 +01:00
ff68b83968
Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
...
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
DirectDraw Surface image decoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 23:34:56 +02:00
55219a78c7
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
...
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 22:47:32 +02:00
5c018ee188
DirectDraw Surface image decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-22 15:23:08 +01:00
7ca3e5203f
Hap decoder and encoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-22 15:23:08 +01:00
80e18bb486
lavf/avio: Extend API with avio_move() and avio_delete()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 12:46:08 +02:00
9b747500f3
libvpxenc: support setting colorspace for vp9
...
the vp9 bitstream supports 8 values:
unknown (default), bt601, bt709, smpte170, smpte240, bt2020, reserved
and sRGB.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
2015-06-20 16:30:46 -07:00
bb42a7d4d4
lavf/brstm: add support for BFSTM files
...
Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-17 13:24:11 +02:00
28efeb6502
doc: avoid incorrect phrase 'allows to'
...
Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-16 21:48:51 +02:00
202188a26c
doc/muxers.texi: properly insert {}s in example
...
use '@{' / '@}', fixes compile errors:
*** '{' without macro. Before: 1:-'.'}
*** '}' without opening '{' before:
since:
907ac20
2015-06-16 12:13:43 +02:00
907ac20aa2
avformat/hlsenc: added HLS encryption
...
Added HLS encryption with -hls_key_info_file <key_info_file> option. The
first line of key_info_file specifies the key URI written to the
playlist. The key URL is used to access the encryption key during
playback. The second line specifies the path to the key file used to
obtain the key during the encryption process. The key file is read as a
single packed array of 16 octets in binary format. The optional third
line specifies the initialization vector (IV) as a hexadecimal string to
be used instead of the segment sequence number (default) for encryption.
Changes to key_info_file will result in segment encryption with the new
key/IV and an entry in the playlist for the new key URI/IV.
Key info file format:
<key URI>
<key file path>
<IV> (optional)
Example key URIs:
http://server/file.key
/path/to/file.key
file.key
Example key file paths:
file.key
/path/to/file.key
Example IV:
0123456789ABCDEF0123456789ABCDEF
Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo
foo.m3u8
file.keyinfo:
http://server/file.key
/path/to/file.key
0123456789ABCDEF0123456789ABCDEF
Example shell script:
BASE_URL=${1:-'.'}
openssl rand 16 > file.key
echo $BASE_URL/file.key > file.keyinfo
echo file.key >> file.keyinfo
echo $(openssl rand -hex 16) >> file.keyinfo
ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \
-hls_key_info_file file.keyinfo out.m3u8
--
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-16 03:25:31 +02:00
eb85060b84
avfilter/af_afade: add couple of more curves
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-15 20:55:05 +00:00
8ce321f0aa
encoders.texi: update libvpx documentation
...
modeled after the libx264 section.
Reviewed-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
2015-06-15 12:09:02 -07:00
d107413f1c
doc/filters: add one more compand example found in the wild
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-15 17:20:23 +00:00
dd6c8575db
examples/demuxing_decoding: use properties from frame instead of video_dec_ctx
...
This is more robust.
And only check if there is actually a frame returned.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-15 18:32:18 +02:00
ed0b1db640
doc: fix spelling errors
...
Neccessary -> Necessary
formated -> formatted
thee -> the
eventhough -> even though
seperately -> separately
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-14 15:09:33 +02:00
f17d973413
avfilter/vf_colorkey: Add colorkey video filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 01:04:14 +02:00
b8ba2d3915
examples/decoding_encoding: Use the AVFrame width/height for processing images after decoding
...
This is what FFmpeg / FFplay do and it is more robust
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 02:14:26 +02:00
ce3bcb9479
doc/filters: add one more zoompan example
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-12 17:34:05 +00:00
dc52e6200d
doc/ffmpeg: remove tips
...
Ancient and misleading.
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-06-10 13:08:48 -08:00
a5f44bc446
doc/APIchanges: fill in missing stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:08:53 +02:00
6ddb109b90
doc/APIchanges: Add 2.7 separator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:05:07 +02:00
4b082bc241
doc/muxers: document new break_non_keyframes option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 17:08:35 +02:00
5cf84e595d
doc/ffserver: Add entry for missing jpeg variant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 03:41:57 +02:00
252d6200c3
avio: Add avio_put_str16be
2015-06-07 10:14:45 +02:00
7897ed0d3c
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
lavf/http: Indent else-clause.
lavf/http: Properly process HTTP header on listen.
lavf/http: Rudimentary error handling for HTTP requests received from clients.
lavf/http: Process HTTP header before sending response.
lavf/http: Document method option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-06 12:34:05 +02:00
Steve Lhomme
Paul B Mahol
Carl Eugen Hoyos
Michael Niedermayer
Lou Logan
Stefano Sabatini
Hendrik Leppkes
Vittorio Giovara
wm4
Ronald S. Bultje
Clément Bœsch
Marton Balint
Ricardo Constantino
Harshit Mittal
Timothy Gu
Luca Barbato
Vesselin Bontchev
Gwenole Beauchesne
Mariusz Szczepańczyk
Ganesh Ajjanagadde
Stephan Holljes
James Almer
Martin Storsjö
Nicolas George
Jovan Zelincevic
Bernd Bleßmann
Derek Buitenhuis
Zhang Rui
LoRd_MuldeR
Arttu Ylä-Outinen
Anton Khirnov
Michael Niedermayer
Kostya Shishkov
Nicolas DEROUINEAU
Rodger Combs
James Zern
Andreas Cadhalpun
Christian Suloway
Timo Rothenpieler