4fde705396
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
...
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-12 00:44:18 +02:00
5c68e14e42
Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'
...
* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
lavfi: deprecate avfilter_graph_add_filter().
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-12 00:39:09 +02:00
86070b8e5a
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
...
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-12 00:31:44 +02:00
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
fa2a34cd40
lavfi: change the filter registering system to match the other libraries
...
Removes an arbitrary hardcoded limit on the number of filters.
2013-04-11 20:44:03 +02:00
7e8fe4be5f
lavfi: add a function for counting elements in AVFilterPad arrays.
...
The caller needs to know what valid indices can be passed to
avfilter_pad_get_name/type.
2013-04-11 20:43:47 +02:00
7cdd737ba8
lavfi: mark filters with dynamic number of inputs or outputs with special flags
...
This will be useful in avtools in the following commits.
Any other caller might also want to know this information.
2013-04-11 20:42:41 +02:00
1ba95a9cca
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
2013-04-11 20:40:20 +02:00
48a5adab62
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
...
Drop the unused opaque parameter from its signature.
2013-04-11 20:39:13 +02:00
111367263a
lavfi: add AVFilterContext.graph.
...
It will be useful in the following commits.
2013-04-11 20:38:23 +02:00
c2c9801bc9
lavfi: deprecate avfilter_graph_add_filter().
...
Since this function adds a standalone filter to a filter graph and we do
not support creating such filters, there is no reason for this function
to exist.
2013-04-11 20:36:42 +02:00
bc1a985ba0
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
...
Since we do not support "standalone" filters not attached to an
AVFilterGraph, we should not have a public function to create such
filters. In addition that function is horribly named, the action it does
cannot be possibly described as "opening" a filter.
2013-04-11 20:34:14 +02:00
38f0c0781a
lavfi: merge avfiltergraph.h into avfilter.h
...
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
2013-04-11 20:33:33 +02:00
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977michaelni@gmx.at >
2013-04-11 11:20:55 +02:00
cdac3acb11
lavfi: add a bump and docs entries for the AVOptions switch
2013-04-09 19:13:27 +02:00
5c73645d91
lavu/samplefmt: add av_samples_alloc_array_and_pointers()
2013-03-31 18:00:44 +02:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 17:40:28 +01:00
8d928a9d99
lavu/opt: add AV_OPT_TYPE_DURATION.
2013-03-20 21:04:28 +01:00
7aa9af51db
lavu/opt: add AV_OPT_VIDEO_RATE option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-03-20 12:29:54 +00:00
17ebef2fc8
Merge commit '2c328a907978b61949fd20f7c991803174337855'
...
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-20 11:24:11 +01:00
2c328a9079
pixdesc: add a function for counting planes in a pixel format.
2013-03-19 11:12:17 +01:00
ecade984ac
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
...
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-16 16:09:37 +01:00
42c7c61ab2
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
...
This is more consistent with the naming in the rest of Libav.
2013-03-16 05:33:23 +01:00
a75f01d7e0
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
...
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-12 15:35:39 +01:00
6c17ff84ad
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
...
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-08 14:57:41 +01:00
d8b31be6ca
Add the bumps and APIchanges entries for reference counted buffers changes.
2013-03-08 07:41:49 +01:00
12c5c1d3e3
avstring: Add locale independent versions of some ctype.h functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-03-07 15:16:26 +02:00
9767ec6b86
lavu: add escape API
...
The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.
This is based on the ffescape tool code, with a few extensions and fixes.
2013-03-07 01:12:04 +01:00
b59cd089ff
lavfi/abuffersink: add sample_rates field to AVABufferSinkParams
...
Allow to select sample rates.
2013-02-24 23:21:28 +01:00
71cf094e1b
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
...
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
lavfi: connect libavresample options to af_resample via AVFilterGraph
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-24 17:10:55 +01:00
9f1223562e
lavfi: connect libavresample options to af_resample via AVFilterGraph
2013-02-23 17:07:54 -05:00
8102a097a5
doc/APIchanges: List merge commit hashes and version numbers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-15 00:25:16 +01:00
2f3bc51228
apichanges: fix 2 wrong hashes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-14 21:13:32 +01:00
33d6330652
apichanges: Use , instead of / to seperate multiple hashes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-14 20:34:10 +01:00
ad6802f975
apichanges: fix date
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-14 20:32:24 +01:00
9f16cb9e50
doc/APIchanges: fix odd .01 versions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-14 03:33:59 +01:00
e7e14bc69a
Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'
...
* commit '38c1466ca41c73c7ce347da702362cb69c151716':
dict: add av_dict_parse_string()
doc: support multitable in texi2pod
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-26 13:34:30 +01:00
255ae9f380
lavfi: version bump and change log entries after the last commits.
2013-01-26 11:25:21 +01:00
38c1466ca4
dict: add av_dict_parse_string()
...
Can be used to set multiple key/value pairs from a string.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-01-25 17:20:03 +01:00
25be63005f
Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
...
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
lavu: Add av_strnstr()
h264: Allow discarding the cropping information from SPS
Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-25 14:36:45 +01:00
b85a5e87af
lavu: Add av_strnstr()
...
This is a length limited version of strstr()
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-01-25 10:47:51 +01:00
a5faae46a3
APIchanges: Add git version and fix version for avfilter_ref_get_channels().
2013-01-19 10:45:34 +01:00
371cf6ee9a
Add APIchanges entry for av_codec_get_tag2().
2013-01-19 10:42:27 +01:00
e7e0186eeb
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
...
* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d':
lavf: Add functions for SRTP decryption/encryption
lavu: Add an API for calculating HMAC (RFC 2104)
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-15 15:57:33 +01:00
8ee288d258
lavu: Add an API for calculating HMAC (RFC 2104)
...
This supports HMAC-MD5 and HMAC-SHA1 for now, other hashes are
simple to add.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-01-15 11:54:19 +02:00
8ee7b3881b
Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
...
* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
vdpau: Add context and common helpers for hwaccel support
Conflicts:
Changelog
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-14 13:29:00 +01:00
44e065d56c
vdpau: Add context and common helpers for hwaccel support
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-01-13 14:41:27 +01:00
dae382b5b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
pixfmt: add picture format for VDPAU
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-12 13:42:42 +01:00
f89466ad6f
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
...
Also fix a lavu version typo in APIchanges.
2013-01-12 12:28:12 +01:00
75afbe2ab4
Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'
...
* commit '1fb8f6a44f06e48386450fe0363aefc02583d24a':
x86: lavr: add SSE2 quantize() for dithering
doc/APIchanges: fill in missing dates and hashes.
rtpdec_vp8: Request a keyframe if RTP packets are lost
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-09 12:14:56 +01:00
