Peter Ross
89f2f5dbd7
On2 VP7 decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25 13:29:05 +01:00
Michael Niedermayer
575b957758
dox/scaler:fix bicubiclin typo
...
See Ticket3486
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 22:04:52 +01:00
Michael Niedermayer
8de75f703a
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
...
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
af_volume: support using replaygain frame side data
Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:04:47 +01:00
Michael Niedermayer
3e1f24131a
Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'
...
* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
frame: add a function for removing side data from a frame
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 14:51:44 +01:00
Michael Niedermayer
83e8978798
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
...
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 14:03:55 +01:00
Michael Niedermayer
595ba3b962
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
...
* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
lavf: add an AVStream field for exporting stream-global side data
Conflicts:
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 13:41:49 +01:00
Michael Niedermayer
bd34e26b27
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
...
* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
lavc: give a typedeffed name to the AVPacket.side_data struct
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 13:27:33 +01:00
Anton Khirnov
06c3cd3c01
af_volume: support using replaygain frame side data
2014-03-24 06:07:51 +01:00
Anton Khirnov
d161ae0a37
frame: add a function for removing side data from a frame
2014-03-24 06:07:51 +01:00
Anton Khirnov
5a7e35dd23
Add replaygain side data type and code for parsing replaygain tags.
2014-03-24 06:07:51 +01:00
Anton Khirnov
25b3258656
lavf: add an AVStream field for exporting stream-global side data
2014-03-24 06:07:51 +01:00
Anton Khirnov
0e2c3ee9a3
lavc: give a typedeffed name to the AVPacket.side_data struct
2014-03-24 06:07:50 +01:00
Nicolas George
26dea7731e
lavf/concatdec: allow to match streams by id.
...
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
2014-03-23 19:15:07 +01:00
Vittorio Giovara
2a38651033
RELEASE_NOTES: mention new filters
2014-03-23 17:30:52 +01:00
Michael Niedermayer
9d6a27d533
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
...
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
dsputil: Move thirdpel-related bits into their own context
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 23:26:23 +01:00
rogerdpack
3eafe1d71c
udp: try to clarify verbiage on buffer_size
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 16:46:06 +01:00
Diego Biurrun
57f09608e1
dsputil: Move thirdpel-related bits into their own context
2014-03-22 06:17:30 -07:00
Anshul Maheshwari
6d25e90262
doc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is AV_PICTURE_TYPE_I
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-21 15:21:15 +01:00
Carl Eugen Hoyos
074db4b764
Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.
2014-03-19 09:11:22 +01:00
Andrey Utkin
e10ab43614
doc/examples: Add example transcoding.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 20:56:33 +01:00
Michael Niedermayer
6b1ca1709f
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
...
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
RGBA64 pixel formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c
See: 9569a3c9f4
See: 92afb43162
, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 14:41:13 +01:00
Jean First
1481d24c3a
RGBA64 pixel formats
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-16 23:05:47 +01:00
Peter Ross
40f88796c6
Phantom Cine demuxer (iteration 2014.3)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 18:24:30 +01:00
Michael Niedermayer
3fc2362aef
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
...
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
Remove all SPARC architecture optimizations
Conflicts:
Makefile
configure
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/dsputil_vis.h
libavcodec/sparc/hpeldsp_vis.c
libavcodec/sparc/simple_idct_vis.c
libavcodec/sparc/vis.h
libswscale/sparc/yuv2rgb_vis.c
libswscale/swscale_internal.h
If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 22:35:47 +01:00
Michael Niedermayer
bb6de15d92
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: Match stream id
Conflicts:
cmdutils.c
doc/fftools-common-opts.texi
See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 14:21:27 +01:00
Diego Biurrun
b4dd424d96
Remove all SPARC architecture optimizations
...
SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.
2014-03-13 05:50:28 -07:00
Luca Barbato
81498ceb5b
avconv: Match stream id
...
Quite useful to select by pid in MPEG-TS.
2014-03-13 11:59:34 +01:00
Michael Niedermayer
12ce58bebd
doc/texi2pod: fix encoding type
...
docs say:
'A document having more than one "=encoding" line should be considered an error. '
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 03:54:48 +01:00
Michael Niedermayer
b5c6b23acd
doc/platform: mention that yuvis gas-preprocessor is currently missing some changes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:08:41 +01:00
Michael Niedermayer
675a66a93b
doc: switch github urls to https
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:05:26 +01:00
Michael Niedermayer
835f41376d
Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7'
...
* commit 'd15c536123a44362ace6299c391a492c90b83fc7':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:02:56 +01:00
Martin Storsjö
d15c536123
doc: Point to the correct, actually maintained gas-preprocessor repo
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-12 20:43:55 +02:00
Michael Niedermayer
ad341b3bc6
update doc/APIchanges
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 13:51:09 +01:00
Fred Rothganger
3f3229cd10
avformat: extracting NTP timestamp from RTCP
...
For muxing, it accepts
both 0 and AV_NOPTS_VALUE. For demuxing, it will present
AV_NOPTS_VALUE when start_time_realtime is unknown.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 13:33:14 +01:00
Stephen Hutchinson
5336cd6374
doc/general.texi: Adjust the notes on AviSynth
...
FFmpeg provides local copies of these headers in compat/avisynth/,
and there is no restriction against using 2.5.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 12:45:24 +01:00
Michael Niedermayer
cd25412f59
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
See: c01d1d4ddf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:53:54 +01:00
Michael Niedermayer
0d487654ea
Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'
...
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
http: Improve options descriptions
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 255ec768da
See: 0a7cd74043
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:43:21 +01:00
Michael Niedermayer
76a939d0e5
Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
...
* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
http: Add support for selecting a request range
Conflicts:
doc/protocols.texi
libavformat/http.c
See: d52882faef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:12:30 +01:00
Michael Niedermayer
f36da16ede
Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'
...
* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
http: Support setting custom User-Agent
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 2bb1c713cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:45:16 +01:00
Michael Niedermayer
c03af3ac1c
Merge commit 'e58c85b0686892960042232e51c77168b264838a'
...
* commit 'e58c85b0686892960042232e51c77168b264838a':
http: Export Content-Type information
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 76d851b656
See: 20899c54f0
See: 255ec768da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:33:14 +01:00
Michael Niedermayer
ca2369cdee
Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
...
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
See: a92fbe16f2
See: 636273d3d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:18:12 +01:00
Clément Bœsch
2572d07c1f
http: Allow setting a Content-Type for POST requests
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Alessandro Ghedini
fe568b3d27
http: Improve options descriptions
...
Add documentation where missing.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Anssi Hannula
2ec33d2712
http: Add support for selecting a request range
...
Comment from Reimar Döffinger included as pro memoria.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Clément Bœsch
ddfc989063
http: Support setting custom User-Agent
...
Contextually make the default User-Agent use the common
"Name/Version" pattern.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Michael Niedermayer
e58c85b068
http: Export Content-Type information
...
Bug-Id: https://bugs.debian.org/740421
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Luca Barbato
8075c3d8bb
http: Add support reading ICY metadata
...
Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.
Bug-Id: https://bugs.debian.org/739936
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Michael Niedermayer
50a3c82302
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Add section about AviSynth support
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 21:24:54 +01:00
Stephen Hutchinson
908836e207
doc: Add section about AviSynth support
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-03-11 20:37:19 +01:00
Michael Niedermayer
9a05e8a385
doc/APIchanges: fill in dates
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 01:21:56 +01:00
Nicolas George
97e87e09c8
lavf: add subfile protocol.
2014-03-08 12:36:57 +01:00
compn
84bccae8e9
doc: fix typo
2014-03-07 17:07:37 -05:00
Michael Niedermayer
64e4bd7414
doc/APIchanges: update versions & hashes
2014-03-07 00:47:55 +01:00
Andreas Cadhalpun
9898bd9a82
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 21:12:40 +01:00
Michael Niedermayer
2fb0027c26
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
...
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 13:07:20 +01:00
Michael Niedermayer
91550f46cd
doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7
/ 728c465
- lavc 55.26.0 - vdpau.h"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 22:02:09 +01:00
Anton Khirnov
599b81ca9a
lavfi: add shuffleplanes filter
2014-03-05 21:52:02 +01:00
Jason Hsu
8fb4dba89d
doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 16:10:06 +01:00
Andrey Utkin
bc764d786f
Add "prefer_tcp" flag to "rtsp_flags"
...
If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 22:54:13 +01:00
Lukasz Marek
06fed44051
lavd/avdevice: add device iterators
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-03 23:39:07 +01:00
Michael Niedermayer
e4a6310cce
update for 2.2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 03:34:59 +01:00
Michael Niedermayer
5d166de258
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 11:27:02 +01:00
Andrew Kelley
738f83582a
lavfi: add compand audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-26 08:09:58 +01:00
Michael Niedermayer
1f2bacc897
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
...
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
libavfilter: example audio filtering program
Conflicts:
.gitignore
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 20:26:00 +01:00
Anton Khirnov
e7dfaf16a4
libavfilter: example audio filtering program
...
Based on a patch by Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-02-25 13:22:10 +01:00
Michael Niedermayer
a8ad7e47fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
texi2pod: always declare the pod file as UTF-8 encoded
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 09:02:57 +01:00
Janne Grunau
5ea14d48a8
texi2pod: always declare the pod file as UTF-8 encoded
2014-02-24 23:36:09 +01:00
Michael Niedermayer
75f6ed8dc2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 22:29:24 +01:00
Michael Niedermayer
26dad980ba
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
...
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 22:19:41 +01:00
Michael Niedermayer
a908de7f49
avformat/options_table: add named constants for avoid_negative_ts
...
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 19:46:11 +01:00
Vittorio Giovara
c91488ab33
doc: fix one accented word
2014-02-24 17:54:03 +01:00
Vittorio Giovara
48d1ed9c83
doc: name correct header
2014-02-24 17:54:03 +01:00
Michael Niedermayer
fff5262301
Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'
...
* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
frame: add a convenience function for copying AVFrame data
Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 09:38:32 +01:00
Michael Niedermayer
cc6cc84bc4
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
...
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 09:15:46 +01:00
Michael Niedermayer
a66be60888
swresample: add swr_is_initialized()
...
Idea-from/based-on: 7e86c27b4e
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 08:23:22 +01:00
Anton Khirnov
1155fd02ae
frame: add a convenience function for copying AVFrame data
2014-02-24 07:25:07 +01:00
Anton Khirnov
746dca483a
avconv: support forcing codec tags for input streams
2014-02-24 07:25:07 +01:00
Michael Niedermayer
5367c0be62
Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'
...
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
lavr: add a function for checking whether AVAudioResampleContext is open
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 21:06:02 +01:00
Anton Khirnov
7e86c27b4e
lavr: add a function for checking whether AVAudioResampleContext is open
2014-02-22 20:52:36 +01:00
Michael Niedermayer
6a24d77929
Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
...
* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 02:01:13 +01:00
Michael Niedermayer
f4c8d00223
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
...
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 01:50:26 +01:00
Michael Niedermayer
4ba03e37fd
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
...
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 22:09:10 +01:00
Anton Khirnov
c3ecd968f0
AVOptions: add flags for read/read-only options
2014-02-19 21:52:17 +01:00
Anton Khirnov
6bb8720f00
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
...
It was never used since it was added and the things it was intended for
are now exported differently.
2014-02-19 21:52:17 +01:00
Luca Barbato
93632a70f9
doc: Name the MOV muxer as it should be called
...
The section name is the muxer, not the format.
2014-02-19 16:59:40 +01:00
Luca Barbato
a7b3216cbd
doc: Sort the muxer documentation
...
Keep the sections alphabetically sorted.
2014-02-19 16:59:40 +01:00
Michael Niedermayer
b14517d3cd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 16:16:41 +01:00
Vittorio Giovara
35b05c5184
vf_interlace: deprecate lowpass option
2014-02-19 12:26:34 +01:00
Michael Niedermayer
341639fe80
doc/examples: remove pathes from doxy examples
...
This makes the examples page less cluttered
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 13:50:53 +01:00
Michael Niedermayer
38a08e0aea
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd: add list devices API
lavd/opengl_enc_shaders: fix gray* shader
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 03:18:44 +01:00
Michael Niedermayer
1fc74926a5
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
...
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 02:22:01 +01:00
Alexander Strasser
2218fbe05e
doc/APIchanges: Update for new function avio_find_protocol_name
...
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2014-02-16 22:49:43 +01:00
Diego Biurrun
f53e274f4c
doc: Fix project name typo
2014-02-16 22:08:21 +01:00
Diego Biurrun
b339182eba
Move all example programs to doc/examples
...
Also drop support for building examples in library directories.
2014-02-16 21:37:21 +01:00
Lukasz Marek
81c3f81d6f
lavd: add list devices API
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-16 20:07:08 +01:00
Nicholas Robbins
b4d308c04f
lavfi: adding dejudder filter to remove judder produced by partially telecined material.
...
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 17:43:58 +01:00
Timothy Gu
8fe1076094
doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY
...
These charts in man page are currently destroyed.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 03:10:38 +01:00
Michael Niedermayer
a2bc6c116d
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
...
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 02:05:29 +01:00
Tim Walker
c98f3169bf
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
2014-02-15 22:24:53 +01:00
Michael Niedermayer
042ab7c49e
doc/doxy-wrapper.sh: fix execute flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15 16:51:06 +01:00