Carl Eugen Hoyos
63c0b41904
Fix standalone compilation of the adts muxer.
2014-07-28 23:25:54 +02:00
Vignesh Venkatasubramanian
3e73d14290
lavf: Add WebM DASH Manifest Muxer
...
This patch adds the ability to generate WebM DASH manifest XML using
ffmpeg. A sample command line would be as follows:
ffmpeg \
-f webm_dash_manifest -i video1.webm \
-f webm_dash_manifest -i video2.webm \
-f webm_dash_manifest -i audio1.webm \
-f webm_dash_manifest -i audio2.webm \
-map 0 -map 1 -map 2 -map 3 \
-c copy \
-f webm_dash_manifest \
-adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \
manifest.xml
It works by exporting necessary fields as metadata tags in matroskadec
and use those values to write the appropriate XML fields as per the WebM
DASH Specification [1]. Some ideas are adopted from webm-tools project
[2].
[1]
https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification
[2]
https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 23:58:36 +02:00
Lukasz Marek
4cc0f79a2c
lavf: add samba protocol via libsmbclient
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 20:38:55 +02:00
Star Brilliant
3f815f713b
AVFormat: LRC demuxer and muxer
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 19:18:31 +02:00
Carl Eugen Hoyos
4c145b692c
Autodetect JPEG2000 imagess.
...
Autodetection of jp2 files does not work yet, the files are detected
as mov.
2014-07-04 02:10:26 +02:00
Michael Niedermayer
a9ce5d92e6
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
...
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
daud: split muxer and demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 21:42:16 +02:00
Nidhi Makhijani
0955e57ad0
daud: split muxer and demuxer
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-03 10:46:11 -07:00
Carl Eugen Hoyos
d538dd824e
avformat: Add image3 demuxers with format autodetection
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 18:14:06 +02:00
Carl Eugen Hoyos
b02cfad7d2
Fix standalone compilation of the wtv muxer.
2014-07-02 23:41:29 +02:00
Michael Niedermayer
9e8c92226f
Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'
...
* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
build: Add missing object files for webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:31:22 +02:00
Michael Niedermayer
738272826f
Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
...
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:19:41 +02:00
Michael Niedermayer
2ca4802601
Merge commit '49470b9404583ab3aff6835f78a759349d331696'
...
* commit '49470b9404583ab3aff6835f78a759349d331696':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 00:13:34 +02:00
Diego Biurrun
85d805d5cc
build: Add missing object files for webm muxer
2014-06-22 06:28:46 -07:00
Diego Biurrun
03391b5432
build: Add missing object files for Matroska demuxer
2014-06-22 06:28:46 -07:00
Diego Biurrun
49470b9404
build: Add missing replaygain object file for CAF demuxer
2014-06-22 06:28:45 -07:00
Diego Biurrun
97578f5f3b
build: Add missing object file for Matroska demuxer
...
Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-06-21 11:53:43 +02:00
James Almer
4c9ee1590f
lavf/Makefile: fix standalone compilation of live_flv demuxer
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19 13:25:28 +02:00
Anton Khirnov
894682a973
Remove avserver.
...
It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.
2014-06-18 14:55:28 +02:00
Michael Niedermayer
83d100baea
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
...
* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
lavf: group dump functions together
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:03 +02:00
Vittorio Giovara
2dc265619a
lavf: group dump functions together
2014-06-14 00:24:35 -04:00
Carl Eugen Hoyos
aab2e939a9
Fix compilation with --disable-everything --enable-demuxer=matroska.
...
Fixes ticket #3693 .
2014-05-31 16:29:02 +02:00
Michael Niedermayer
61917a104e
Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
...
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
matroskaenc: write the channel mask for FLAC
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28 13:19:26 +02:00
Michael Niedermayer
579e2b2874
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
...
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28 13:02:19 +02:00
Anton Khirnov
106b62f4ba
matroskaenc: write the channel mask for FLAC
2014-05-28 07:55:14 +02:00
Anton Khirnov
23f741f793
matroskadec: parse the channel layout mask for FLAC
...
It is commonly stored in a vorbiscomment block in codec private data.
2014-05-28 07:50:32 +02:00
Carl Eugen Hoyos
27d460fe98
Refuse to mux H.264 with fourcc H264 into avi without startcode.
...
Fixes ticket #3638 .
2014-05-23 16:20:22 +02:00
Michael Niedermayer
56d3cd1455
Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
...
* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
yuv4mpeg: split the demuxer and muxer into separate files
Conflicts:
libavformat/yuv4mpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 13:37:25 +02:00
Anton Khirnov
e4dc1000d7
yuv4mpeg: split the demuxer and muxer into separate files
2014-05-18 10:21:31 +02:00
Michael Niedermayer
3d7218d932
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
...
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13 22:40:32 +02:00
Janne Grunau
449511740f
build: handle library dependencies in configure
...
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
2014-05-13 20:02:01 +02:00
Carl Eugen Hoyos
4116cbeaf5
Fix oga muxer standalone compilation.
2014-05-03 08:51:27 +02:00
Michael Niedermayer
01a39a978c
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
...
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
Silicon Graphics Movie demuxer
Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h
See: 6fb40779cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 20:17:33 +02:00
Peter Ross
55ddd700c6
Silicon Graphics Movie demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:27 +02:00
Peter Ross
ab683efb2b
Magic Lantern Video (MLV) demuxer
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 05:06:00 +02:00
Peter Ross
27998451d8
DSD Stream File (DSF) demuxer
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 03:25:58 +02:00
Anh
c150e2cf32
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.
...
Fixes ticket #3568 .
2014-04-16 20:00:17 +02:00
Michael Niedermayer
6e573b7759
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
...
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:25:15 +02:00
Anton Khirnov
9a07fac678
mov: read hydrogenaudio replaygain information
2014-04-10 13:53:32 +02:00
Paul B Mahol
eeadcdfd1a
LucasArts SMUSH demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:41 +02:00
Michael Niedermayer
849a8c4cdb
Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'
...
* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
oggparsevorbis: export replaygain tags from Vorbis comments
Conflicts:
libavformat/Makefile
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 23:17:33 +02:00
Michael Niedermayer
8e8c8607fc
Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'
...
* commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202':
flacdec: export replaygain tags from Vorbis comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 22:59:28 +02:00
Alessandro Ghedini
0048deb84c
oggparsevorbis: export replaygain tags from Vorbis comments
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 17:40:51 +02:00
Alessandro Ghedini
1d55f8d5f6
flacdec: export replaygain tags from Vorbis comments
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 17:40:51 +02:00
Peter Ross
92d657b5f1
avformat/wtvenc: advise user when H264 startcode is not present
...
Fixes ticket #3473 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 16:36:47 +02:00
Michael Niedermayer
075d6c066b
avformat: add image2 brender pix demuxer
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 23:54:51 +01:00
Michael Niedermayer
13bcb4de33
avformat: add image2 alias pix demuxer
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 23:54:51 +01:00
Paul B Mahol
70daeacd6e
PAF demuxer and decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-27 23:34:47 +01:00
Michael Niedermayer
1034fbdf53
Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
...
* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
mp3dec: export replaygain tags from ID3v2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:11:08 +01:00
Anton Khirnov
15c5a8d22d
mp3dec: export replaygain tags from ID3v2
2014-03-24 06:13:39 +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