Michael Niedermayer
9b41bf5c3d
Merge commit ' a982c5d74f'
...
* commit 'a982c5d74f ':
tests: drop bc dependency
Conflicts:
tests/fate-run.sh
See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:08:31 +01:00
Clément Bœsch
a982c5d74f
tests: drop bc dependency
...
We already have a dependency on awk and bc is sometimes not found in the
base system.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:17:45 +02:00
Arwa Arif
627d2a7628
avfilter/vf_eq: Add process_command to eq.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 00:06:37 +01:00
Michael Niedermayer
e821910a21
Merge commit ' 062cd5a975'
...
* commit '062cd5a975 ':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:44:58 +01:00
Michael Niedermayer
dfe5a9f022
Merge commit ' c56b9b1eb2'
...
* commit 'c56b9b1eb2 ':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:31:26 +01:00
Michael Niedermayer
560eb7179a
Merge commit ' 31d2039cb4'
...
* commit '31d2039cb4 ':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 20:39:04 +01:00
Michael Niedermayer
e3755119fa
Merge commit ' 5b1d9ceec7'
...
* commit '5b1d9ceec7 ':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 20:23:48 +01:00
Oleksij Rempel
062cd5a975
lavf: Add DSS demuxer
...
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19 12:05:19 -05:00
Oleksij Rempel
c56b9b1eb2
lavc: Add DSS SP decoder
...
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19 12:05:19 -05:00
Anton Khirnov
31d2039cb4
h264_parser: export video format and dimensions
2015-02-19 15:07:52 +01:00
Anton Khirnov
5b1d9ceec7
pixfmt: add a pixel format for QSV hwaccel
2015-02-19 15:07:21 +01:00
Nicolas George
c49c42a4a3
doc/faq: explain DAR/SAR preserving.
2015-02-19 11:30:30 +01:00
Nicolas George
b491751409
doc: set documentencoding on toplevel texi files.
...
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
2015-02-19 11:30:30 +01:00
Christophe Gisquet
bc8e044d8c
x86/doc/Makefile: DBG=1 to preprocess external asm
...
The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.
This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 13:08:04 +01:00
Clément Bœsch
bab4fcebb1
avfilter: add paletteuse filter
2015-02-14 20:48:50 +01:00
Clément Bœsch
9b964690e3
avfilter: add palettegen filter
2015-02-14 20:48:50 +01:00
Paul B Mahol
ba22295e76
lavc: deprecate VIMA decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-14 12:48:41 +00:00
Michael Niedermayer
c74b3983f9
Merge commit ' faa8ffda2c'
...
* commit 'faa8ffda2c ':
doc/APIchanges: fill in missing dates and hashes
Conflicts:
doc/APIchanges
See: c651a1aaec
See: 8c8ee17e8d and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 11:54:38 +01:00
Anton Khirnov
faa8ffda2c
doc/APIchanges: fill in missing dates and hashes
...
Also, move a misplaced block to the right position.
2015-02-13 08:35:15 +01:00
Paul B Mahol
edf217ebb7
avfilter: add dcshift filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-11 14:58:35 +00:00
Michael Niedermayer
26db9d3b77
doc/ffmpeg: Document frame_drop_threshold
2015-02-10 15:10:56 -09:00
Paul B Mahol
8b77c4dd42
avfilter: Add repeatfields filter (Port of mp=softpulldown)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10 19:07:20 +01:00
Andreas Cadhalpun
078be09dd7
examples/demuxing_decoding: abort decoding when width, height or pix_fmt change
...
This is necessary, because avcodec_decode_video2 can change
width, height and/or pixel format of the AVCodecContext. Since
video_dst_data and video_dst_linesize are not updated by calling
av_image_alloc again, av_image_copy[_plane] asserts, because the
destination buffer is too small.
In this case, creating a useable rawvideo is not possible anyway, since
it has fixed width/height/pix_fmt.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10 02:43:47 +01:00
Georg Lippitsch
c0367f78d5
doc/indevs: Docs for Blackmagic high bit depth video/audio
...
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09 01:18:58 +01:00
Anshul Maheshwari
1df841f154
doc/APIchanges: updated Data stream changes in APIChange
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 18:39:22 +01:00
Eejya Singh
40b198e987
lavfi/subtitles: add force_style option
...
Signed-off-by: Eejya Singh <singh.eejya@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
2015-02-08 11:36:49 +01:00
Liviu Oniciuc
d2330e5844
doc/muxers/image2: remove the non-negative number requirement for start_number
...
Update after b37858eae1 .
2015-02-04 13:17:30 +01:00
dhead666
48e36f8a12
libavformat/mpegtsenc: allow to set service_type in sdt
...
This adds an option to set the service type in mpegts as defined in ETSI 300 468.
I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).
I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.
The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.
This close issue 4118.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 22:02:26 +01:00
Stefano Sabatini
7b35a01ff0
doc/ffprobe.xsd: drop build_date and build_time from programVersionType
...
Update schema after commit:
103e4c5863
2015-02-02 10:08:22 +01:00
Andreas Cadhalpun
aa2c75e9ad
doc/doxy-wrapper.sh: autodetect version
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 05:04:14 +01:00
Andreas Cadhalpun
103e4c5863
stop embedding the build date
...
Theis makes the build binary reproducible.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 05:04:14 +01:00
Michael Niedermayer
9bacb576bc
Merge commit ' f726fc21ef'
...
* commit 'f726fc21ef ':
ogg: Provide an option to offset the serial number
Conflicts:
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 13:22:21 +01:00
Luca Barbato
f726fc21ef
ogg: Provide an option to offset the serial number
...
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
2015-02-01 02:28:40 +01:00
Andreas Cadhalpun
2a3b7a55b5
examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 21:54:36 +01:00
Paul B Mahol
e7e0005cc6
remove libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 12:01:54 +00:00
Stefano Sabatini
f422f474df
doc/indevs/libcdio: apply minor spell fixes, extend documentation
2015-01-31 11:32:05 +01:00
Paul B Mahol
9fd925dee5
lavfi: remove mp=softpulldown
...
It is supposed to work correctly with MEncoder only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 16:10:11 +00:00
Stefano Sabatini
40b026b1d0
doc/muxers/segment: document strftime option
...
It was added in commit 202947a066 .
2015-01-30 11:52:37 +01:00
Lou Logan
961f2e3aac
doc/indevs: add some XCB info to x11grab
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-01-29 13:12:13 -09:00
Stefano Sabatini
d43c1ec684
examples/filtering: extend comments about setting the filter graph endpoints
...
That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.
2015-01-29 11:12:39 +01:00
Stefano Sabatini
af7b89e08b
lavfi: document assumptions about the input and output labels of a filter graph description
2015-01-29 10:12:34 +01:00
Stefano Sabatini
d11fcf735f
doc/filters: apply some updates to the Filtergraph syntax section
2015-01-29 10:12:34 +01:00
Maneesh Gupta
1600f85cbc
doc/fftools-common-opts: update/extend documentation for -opencl_bench option
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-01-28 10:00:30 +01:00
Michael Niedermayer
62a82c66cd
Merge commit ' 728685f37a'
...
* commit '728685f37a ':
Add a side data type for audio service type.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:03:43 +01:00
Michael Niedermayer
e5c28d4f9a
Merge commit ' 3a70c0c95f'
...
* commit '3a70c0c95f ':
examples/transcode_aac: generate proper PTS and set the muxer timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 13:35:31 +01:00
Michael Niedermayer
d078d57fb7
Merge commit ' c9b19ac892'
...
* commit 'c9b19ac892 ':
examples/transcode_aac: fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 13:29:46 +01:00
Michael Niedermayer
010311d673
Merge commit ' 749a89d1b8'
...
* commit '749a89d1b8 ':
examples/transcode_aac: properly select the output sample format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 13:21:02 +01:00
Anton Khirnov
728685f37a
Add a side data type for audio service type.
...
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
2015-01-27 09:17:48 +01:00
Andreas Unterweger
3a70c0c95f
examples/transcode_aac: generate proper PTS and set the muxer timebase
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:03:08 +01:00
Andreas Unterweger
c9b19ac892
examples/transcode_aac: fix a typo
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:00:23 +01:00