Michael Niedermayer
f9bc65e399
Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'
...
* commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce':
avplay: Exit by default at the end of playback
Conflicts:
Changelog
ffplay.c
Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-06 20:23:29 +02:00
Diego Biurrun
041caf1a63
avplay: Exit by default at the end of playback
...
This is the expected behavior shared by all other cli multimedia players.
Bug-Id: 732
2014-09-06 16:52:59 +02:00
db0company
c701178900
doc: Copyright in CSS, CSS split in 2 files
...
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-06 01:37:31 +02:00
Paul B Mahol
422619646e
add silenceremove filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-09-05 17:30:57 +00:00
Mark Harris
ef16d12606
doc/filters.texi: fix time duration references
...
Make time duration references consistent, using @ref links, and
eliminate incorrect syntax [-]HH[:MM[:SS[.m...]]].
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-09-05 11:20:07 +02:00
Anton Khirnov
12f0388f9c
Add release notes for 11.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-04 07:14:27 -07:00
Timothy Gu
17ad5fbb8a
Use makeinfo to generate html doc for the new website
...
texi2html is deprecated by upstream in favor of makeinfo/texi2any. See:
- https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html
- https://wiki.debian.org/Texi2htmlTransition
- https://lists.debian.org/debian-devel/2013/05/msg01516.html
This is actually two separate changes.
Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>.
Fixes Trac ticket #3232 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-09-04 02:34:20 +02:00
Lou Logan
efaa4a8dbf
doc/demuxers: document gif demuxer
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-09-03 10:16:05 -08:00
Michael Niedermayer
4d13d440ee
Merge commit '94f084324e648876508bed546d950762f10b875e'
...
* commit '94f084324e648876508bed546d950762f10b875e':
texi2pod: Make it output a single encoding string
Conflicts:
doc/texi2pod.pl
See: 12ce58bebd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 12:24:47 +02:00
Luca Barbato
94f084324e
texi2pod: Make it output a single encoding string
...
Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.
2014-09-03 02:14:17 +02:00
Rong Yan
6abeaf2781
build sys: enable the decoding_encoding example under the ffmpeg/doc/examples
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 04:19:15 +02:00
Mark Harris
1b3a98f137
doc/filters.texi: fix filter name in examples
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 21:50:52 +02:00
Timothy Gu
8d6ec61186
general: Fix usage of @float
...
makeinfo chokes on that.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 16:21:44 +02:00
Michael Niedermayer
f30a8154ab
Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'
...
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
avcodec: add stream-level stereo3d side data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:23:01 +02:00
Vittorio Giovara
9301486408
avcodec: add stream-level stereo3d side data
2014-08-28 12:33:26 -04:00
Stefano Sabatini
fa39f8c0e2
doc/ffprobe: fix -show_entries example
2014-08-28 12:20:18 +02:00
Deb Mukherjee
b6a0b8bcf4
Adds support for setting aq_mode in libvpx encoder
...
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-08-27 23:12:47 -03:00
James Darnley
8c1b942ad7
Replace incorrect use of "multiply" with "multiple"
...
Also replace the plural form "multiplies" with "multiples".
2014-08-27 16:00:17 -08:00
Michael Niedermayer
ffa90d99fd
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
...
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
doc: fix a typo
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 20:48:07 +02:00
Gabriel Dume
56a721f020
doc: fix a typo
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-26 17:27:15 +02:00
Michael Niedermayer
1f7e6c0713
doc/snow: remove possibly wrong todo item
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 01:19:26 +02:00
Michael Niedermayer
beaf86bd02
doc/APIchanges: fill in dates and hashes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 15:57:37 +02:00
Michael Niedermayer
215db2935b
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
...
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
lavf: add AVFormatContext.max_ts_probe
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 13:25:09 +02:00
Michael Niedermayer
f1b04f803e
Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'
...
* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 12:09:29 +02:00
Anton Khirnov
b263f8ffe7
lavf: add AVFormatContext.max_ts_probe
...
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
2014-08-25 05:17:54 +00:00
Anton Khirnov
6ca11f7157
doc/APIchanges: fill in missing hashes and dates
2014-08-25 05:16:26 +00:00
Clément Bœsch
f888331769
avfilter: add codecview filter
2014-08-24 14:35:11 +02:00
Carl Eugen Hoyos
6f78c70324
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
2014-08-24 02:49:06 +02:00
Clément Bœsch
f4dec0dba0
doc/filters: fix Shwo/Show typo
2014-08-23 16:07:55 +02:00
Reimar Döffinger
8fc9bd0d32
dict.c: Free non-strduped av_dict_set arguments on error.
...
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-23 15:28:48 +02:00
Muhammad Faiz
c82a288f87
avfilter/showcqt: add fontcolor option
2014-08-23 10:01:22 +02:00
Stefano Sabatini
7e4a4bda0e
doc/filters/apad: extend documentation
2014-08-21 16:59:18 +02:00
Clément Bœsch
f5ddce0753
doc/APIChanges: fill 2 hashes from my recent API additions
2014-08-21 12:36:28 +02:00
Clément Bœsch
980a5b01fd
avutil/motion_vector.h: fix coordinate types
...
See b0352b1997
for more information on the
feature.
2014-08-21 12:27:34 +02:00
Clément Bœsch
5abcc8e1a0
doc/filters: fix cline option name recently added
2014-08-20 22:30:38 +02:00
Clément Bœsch
e35fb5add4
avfilter/showwaves: add split_channels option
2014-08-20 22:18:38 +02:00
Clément Bœsch
f2f6d45dbd
avfilter/showwaves: add "cline" mode (centered line)
2014-08-20 22:16:50 +02:00
Lou Logan
d2163f5e28
doc/ffmpeg: fix metadata language example
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-08-20 10:44:22 -08:00
Clément Bœsch
b0352b1997
avcodec: export motion vectors in frame side data on demand
...
The reasoning behind this addition is that various third party
applications are interested in getting some motion information out of a
video "for free" when it is available.
It was considered to export other information as well (such as the intra
information about the block, or the quantization) but the structure
might have ended up into a half full-generic, half full of codec
specific cruft. If more information is necessary, it should either be
added in the "flags" field of the AVMotionVector structure, or in
another side-data.
This commit also includes an example exporting them in a CSV stream.
2014-08-18 14:13:57 +02:00
Gabriel Dume
dd35d451fb
doc: Change wrong term to avoid confusion
...
A function declaration is the prototype.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-18 13:29:25 +02:00
Stefano Sabatini
1013d8dd69
ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress
...
The new option names are more explicit.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-08-17 22:51:45 -04:00
Nicolas George
4f3e2f107b
ffprobe: add -show_data_hash option.
2014-08-17 11:30:55 +02:00
Michael Niedermayer
b7d5e016a3
swresample: Add AVFrame based API
...
Based on commit fb1ddcdc8f
by Luca Barbato <lu_zero@gentoo.org>
Adapted for libswresample by Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 20:39:37 +02:00
Reimar Döffinger
c2829dc925
dict.c: Add av_dict_set_int helper function.
...
This allows getting rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:30:18 +02:00
Nicolas George
7c10e32ae5
lavfi/avf_showspectrum: add full frame sliding mode.
2014-08-14 14:59:23 +02:00
Michael Niedermayer
082d52354f
doc: fix toolname
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 01:00:49 +02:00
Michael Niedermayer
b8e4c11d93
Merge commit '481a3667495425db9fdffb653292b6460fb68208'
...
* commit '481a3667495425db9fdffb653292b6460fb68208':
cmdutils: allow matching by metadata in stream specifiers
Conflicts:
Changelog
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:41:21 +02:00
Michael Niedermayer
c8571c61ec
Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3'
...
* commit '8ddc32629a6d6be77256694c9e322dde134609f3':
mem: add av_strndup() for duplicating substrings
Conflicts:
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:29:06 +02:00
Michael Niedermayer
313d75cd43
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
...
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 22:54:31 +02:00
Michael Niedermayer
2ba4577809
Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'
...
* commit 'a8c104a511f97e4ea617df73b31737e28a8a5126':
AVOption: add support for dictionary types.
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 22:39:54 +02:00
Michael Niedermayer
ed8e6d535c
Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'
...
* commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d':
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
Conflicts:
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 22:22:52 +02:00
Anton Khirnov
481a366749
cmdutils: allow matching by metadata in stream specifiers
2014-08-13 17:24:18 +00:00
Anton Khirnov
8ddc32629a
mem: add av_strndup() for duplicating substrings
2014-08-13 17:24:18 +00:00
Stefano Sabatini
a539f1cbbd
doc/filters: correct confusing statements about *showinfo shown values
...
Fix trac issue #3850 .
2014-08-13 18:14:24 +02:00
Andrew Stone
7e38903b5c
http: enable icy metadata by default.
...
It won't hurt servers that don't care about the header,
and those that do will include it by default.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-13 16:10:15 +00:00
Andrew Stone
a8c104a511
AVOption: add support for dictionary types.
...
In order to support metadata being set as an option, it's necessary to be able
to set dictionaries as values.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-13 16:07:40 +00:00
Andrew Stone
afbd4b7e09
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
...
The only flags, for now, indicate if metadata was updated and are set after each call to
av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly
as packets might be buffered in AVFormatContext.packet_buffer before being given to the user
in av_read_frame().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-13 16:04:48 +00:00
Daniel Oberhoff
9f617a14a0
avfilter: ported lenscorrection filter from frei0r
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-12 03:33:30 +02:00
Michael Niedermayer
78eaaa857e
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
...
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:20:37 +02:00
Luca Barbato
fb1ddcdc8f
avresample: Introduce AVFrame-based API
2014-08-10 14:26:37 +02:00
Michael Niedermayer
97f8c7a03e
bump libpostproc and libswresample
...
this is needed / avoids some headaches as one of their dependancies
(libavutil) was bumped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:17:02 +02:00
Michael Niedermayer
a57ece0cb4
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
...
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 00:26:45 +02:00
Anton Khirnov
1985c2e75c
Bump major versions of all libraries.
2014-08-09 16:58:33 +00:00
Michael Niedermayer
3841f2ae66
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
...
* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
avcodec: Rename xvidmmx IDCT to xvid
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 12:11:13 +02:00
Diego Biurrun
d35b94fbab
avcodec: Rename xvidmmx IDCT to xvid
...
The Xvid IDCT is not MMX-specific.
2014-08-08 11:13:30 -07:00
Muhammad Faiz
94494dab91
avfilter/showcqt: add and extend tlength and volume options
...
Add a tlength option with frequency and timeclamp variable
Add to the volume option support for frequency and timeclamp variable,
a_weighting, b_weighting and c_weighting functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:59:02 +02:00
James Almer
5c3c67126f
lavf/avio: rename url_feof() to avio_feof()
...
It's a public function and should use the avio_ namespace
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:22 +02:00
Clément Bœsch
cec59eb63f
avfilter/dctdnoiz: add 8x8 dct and make it the default
...
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
2014-08-07 21:24:12 +02:00
Michael Niedermayer
c6a596f626
doc/APIchanges: Correct function reference.
...
The commit bb789016d4
un-deprecated sws_getContext()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:00:46 +02:00
Michael Niedermayer
4917fecf4a
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
...
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:52:40 +02:00
Michael Niedermayer
a561662fb7
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
...
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:43:11 +02:00
Diego Biurrun
bb789016d4
swscale: Undeprecate sws_getContext()
...
sws_getCachedContext is not a full replacement for the function.
2014-08-07 04:03:00 -07:00
Diego Biurrun
ad1ee5fa75
avcodec: Undeprecate reordered_opaque
...
It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts. There is no way to cleanly achieve this
without the field.
2014-08-07 04:03:00 -07:00
Timothy Gu
9f02a2b224
transcode_aac: fix const return value
...
Fixes Trac #3613 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 04:01:19 +02:00
Michael Niedermayer
a32e306be3
doc/muxers: document which applications are known to need disable_chpl.
...
Thanks to: John Stebbins <stebbins@jetheaddev.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 03:59:37 +02:00
Clément Bœsch
28a2107a8d
avutil: add pixelutils API
2014-08-05 21:05:52 +02:00
mrskman
6f3e15af84
avfilter/avf_showwaves: New p2p mode for showwaves filter
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 14:12:35 +02:00
Michael Niedermayer
a53a107a2f
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
...
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:58:10 +02:00
John Stebbins
0897d2fdc7
movenc: Add option to disable nero chapters
...
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-05 11:36:08 +02:00
Michael Niedermayer
6017c98036
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
...
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
avutil: add AV_PIX_FMT_YA16 pixel format
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 22:12:24 +02:00
Michael Niedermayer
4c8bc6fdee
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
...
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 21:48:00 +02:00
Michael Niedermayer
073c074447
Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'
...
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
pixdesc: Support pixelformat aliases
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 21:32:03 +02:00
Michael Niedermayer
491c52d3b0
Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
...
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
Add Icecast protocol
Conflicts:
Changelog
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h
See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 14:14:13 +02:00
Vittorio Giovara
e9abafca27
avutil: add AV_PIX_FMT_YA16 pixel format
2014-08-04 12:55:08 +01:00
Vittorio Giovara
e96c3b81ca
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
...
The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.
2014-08-04 12:55:08 +01:00
Luca Barbato
d2962e9f89
pixdesc: Support pixelformat aliases
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-08-04 12:55:07 +01:00
ePirat
e3dc2c86fc
libavformat: Add Icecast protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 13:33:44 +02:00
Marvin Scholz
eb9244f202
Add Icecast protocol
...
Icecast is basically a convenience wrapper around the HTTP protocol.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-04 12:56:42 +03:00
Michael Niedermayer
71d008ebe4
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
...
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h
See: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 06:11:34 +02:00
Kieran Kunhya
2a3c36e920
Deprecate AFD field and add AFD as side-data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 05:36:44 +02:00
Kieran Kunhya
1ef9e83764
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-03 15:43:02 -07:00
Michael Niedermayer
e680c731a2
avcodec/avdct: Add get_pixels()
...
Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 23:34:35 +02:00
Michael Niedermayer
9400603140
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
...
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
avcodec: Deprecate unused defines and options
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 20:53:00 +02:00
Michael Niedermayer
f1d6fc7794
Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'
...
* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
examples: filter_audio: Add missing mem.h header for av_freep()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 19:18:25 +02:00
Diego Biurrun
9f17685dfb
avcodec: Deprecate unused defines and options
2014-08-03 03:24:16 -07:00
Stefano Sabatini
ac1e3882cc
doc/ffserver: merge paragraph starting with "What happens next?" with previous one
...
The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.
2014-08-03 11:27:27 +02:00
Diego Biurrun
6a928293dd
examples: filter_audio: Add missing mem.h header for av_freep()
2014-08-03 01:29:43 -07:00
Michael Niedermayer
c87f645a75
Merge commit '52269f48e835a52023656f8330262ae70e6061c4'
...
* commit '52269f48e835a52023656f8330262ae70e6061c4':
Revert "vf_interlace: deprecate lowpass option"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 16:39:28 +02:00
Vittorio Giovara
52269f48e8
Revert "vf_interlace: deprecate lowpass option"
...
This reverts commit 35b05c5184
.
A warning is introduced in case this option is used.
2014-08-01 13:02:29 +01:00
Carl Eugen Hoyos
970c7d9b69
Add forgotten APIchanges entry for probesize2.
...
Update some git hashes.
2014-08-01 12:49:56 +02:00