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
2dc265619a
lavf: group dump functions together
2014-06-14 00:24:35 -04:00
aab2e939a9
Fix compilation with --disable-everything --enable-demuxer=matroska.
...
Fixes ticket #3693 .
2014-05-31 16:29:02 +02:00
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
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
106b62f4ba
matroskaenc: write the channel mask for FLAC
2014-05-28 07:55:14 +02:00
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
27d460fe98
Refuse to mux H.264 with fourcc H264 into avi without startcode.
...
Fixes ticket #3638 .
2014-05-23 16:20:22 +02:00
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
e4dc1000d7
yuv4mpeg: split the demuxer and muxer into separate files
2014-05-18 10:21:31 +02:00
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
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
4116cbeaf5
Fix oga muxer standalone compilation.
2014-05-03 08:51:27 +02:00
01a39a978c
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
...
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
Silicon Graphics Movie demuxer
Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h
See: 6fb40779cd
2014-04-19 20:17:33 +02:00
55ddd700c6
Silicon Graphics Movie demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:27 +02:00
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
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
c150e2cf32
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.
...
Fixes ticket #3568 .
2014-04-16 20:00:17 +02:00
6e573b7759
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
...
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e66
2014-04-10 21:25:15 +02:00
9a07fac678
mov: read hydrogenaudio replaygain information
2014-04-10 13:53:32 +02:00
eeadcdfd1a
LucasArts SMUSH demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:41 +02:00
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
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
0048deb84c
oggparsevorbis: export replaygain tags from Vorbis comments
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 17:40:51 +02:00
1d55f8d5f6
flacdec: export replaygain tags from Vorbis comments
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 17:40:51 +02:00
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
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
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
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
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
15c5a8d22d
mp3dec: export replaygain tags from ID3v2
2014-03-24 06:13:39 +01:00
40f88796c6
Phantom Cine demuxer (iteration 2014.3)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 18:24:30 +01:00
38aee6408a
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'
...
* commit 'a823d0948683bd97dd58556b5740e434166209a8':
matroskaenc: write private data in hvcC format for HEVC.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 23:34:17 +01:00
cb403b2570
avformat: fix hevcs use of golomb from avformat
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:59:46 +01:00
1b1d77ae9b
Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'
...
* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
movenc: write hvcC tag for HEVC.
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:48:08 +01:00
a823d09486
matroskaenc: write private data in hvcC format for HEVC.
2014-03-09 18:09:40 +01:00
20b40a597c
movenc: write hvcC tag for HEVC.
2014-03-09 18:09:40 +01:00
97e87e09c8
lavf: add subfile protocol.
2014-03-08 12:36:57 +01:00
8bcacd9f42
SDR2 demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-22 11:40:27 +00:00
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
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
dcda5ef1ea
lavf: add uncodedframecrc test muxer.
2014-02-11 10:29:02 +01:00
ef5d32b9c5
Add raw HEVC muxer
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-09 14:29:07 +00:00
722554788b
Add raw HEVC muxer
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-09 14:15:44 +00:00
cfe282ec80
Remove now unneeded Makefile dependency for the wtv muxer.
2014-01-29 09:59:45 +01:00
d890db5f53
oggdec: add support for VP8 demuxing
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-30 04:05:27 +01:00
20bc574b86
build fix: apetag.c depends on img2.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 18:51:17 +01:00
8e702bd3a8
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
...
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 20:52:14 +01:00
d64341e498
configure: Prefix libc-related variables with "libc_"
...
Simplifies host/target libc detection splitting.
2013-12-09 11:47:43 +01:00
56572787ae
Add Windows resource file support for shared libraries
...
Originally written by James Almer <jamrial@gmail.com>
With the following contributions by Timothy Gu <timothygu99@gmail.com>
* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.
[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05 23:42:07 +01:00
Michael Niedermayer
Vittorio Giovara
Carl Eugen Hoyos
Anton Khirnov
Janne Grunau
Peter Ross
Anh
Paul B Mahol
Alessandro Ghedini
Tim Walker
Nicolas George
Diego Biurrun
Derek Buitenhuis
James Almer
Yu Xiaolei