generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,111 Commits 24 Branches 241 Tags 173 MiB
feb9057b83
Commit Graph

561 Commits

Author SHA1 Message Date
Eejya Singh
6dc99fdf0e Added STL demuxer and decoder 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-10-22 23:12:38 +02:00
Michael Niedermayer
7891b4fa59 Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0' 
* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
  rtmpproto: Add pause support

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 03:12:10 +02:00
Uwe L. Korn
9bec3ca2b8 rtmpproto: Add pause support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-17 23:13:51 +03:00
Michael Niedermayer
f0a6874de8 avformat: Allow choosing the dump format field separator. 
The default is to maintain the previous ", " for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 00:56:58 +02:00
Michael Niedermayer
9da679e77f Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579' 
* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
  avformat: bump version after mime_type change

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 21:45:41 +02:00
Vittorio Giovara
7ae9791b64 avformat: bump version after mime_type change 2014-10-08 15:59:51 +01:00
James Almer
ddc3768161 avformat: remove obsolete FF_API_READ_PACKET cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:26 -03:00
James Almer
ecf457f3ac avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:23 -03:00
James Almer
3bd9f17b8a avformat: remove obsolete FF_API_SET_PTS_INFO cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:20 -03:00
James Almer
a578b93c73 avformat: remove obsolete FF_API_NEW_STREAM cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:15 -03:00
James Almer
cc787709ee avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:13 -03:00
James Almer
903a0acba4 avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:07 -03:00
Thomas Volkert
1c4c78ee40 sdp: add support for H.261 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-04 00:53:13 +02:00
Michael Niedermayer
883bc7d2e7 Merge commit '55f03d872640175a00bfa262da4652b7312b905f' 
* commit '55f03d872640175a00bfa262da4652b7312b905f':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
	libavformat/version.h

See: 3edb9aaea6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-03 21:46:40 +02:00
Joakim Roubert
55f03d8726 hlsenc: Add parameter -hls_allow_cache 
The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.

Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-03 20:20:28 +03:00
Clément Bœsch
55180b3299 Kill timed SRT 2014-09-30 20:21:14 +02:00
Clément Bœsch
ff5f5cbb46 avformat/assdec: output ASS packets 
After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.

And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.
 2014-09-27 17:32:13 +02:00
wm4
7dd2005e1a avformat: add SUP/PGS subtitle demuxer 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-09-26 10:35:14 +02:00
Carl Eugen Hoyos
88c937fdc8 Autodetect jpg images. 
Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.
 2014-09-26 00:06:41 +02:00
Michael Niedermayer
d8ddac363e Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc' 
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/rtpenc_hevc.c
	libavformat/version.h

See: 6821a5a4ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 00:17:36 +02:00
Thomas Volkert
ddf5fb71ee rtpenc: HEVC/H.265 support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 23:33:26 +03:00
Thomas Volkert
6821a5a4ad rtpenc: HEVC/H.265 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-21 12:49:08 +02:00
Steven Liu
2c21e8b1a4 lavf/hls: add hls_ts_option 
Same as COMMITID 4f5493fe23.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-09-16 16:30:03 +02:00
Clément Bœsch
c7d8dbad14 avformat: remove FF_API_ASS_SSA dead code 2014-09-09 21:34:23 +02:00
Stefano Sabatini
4f5493fe23 lavf/segment: add segment_format_options option 2014-09-07 13:17:46 +02:00
Michael Niedermayer
4bc4f6f170 Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835' 
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpdec_hevc.c
	libavformat/version.h

See: 96b2ba68c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 14:56:53 +02:00
Thomas Volkert
95e177eeb2 rtpdec: HEVC/H.265 support 
As specified in draft-ietf-payload-rtp-h265-06.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-03 02:39:24 +02:00
Michael Niedermayer
215db2935b Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' 
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 13:25:09 +02:00
Anton Khirnov
b263f8ffe7 lavf: add AVFormatContext.max_ts_probe 
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
 2014-08-25 05:17:54 +00:00
Michael Niedermayer
300d489ac9 Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd' 
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
	Changelog
	libavformat/oggenc.c
	libavformat/version.h

See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 21:41:00 +02:00
Luca Barbato
051aadeed1 ogg: Provide aliases for Speex, Opus and audio-only ogg 
Since they are aliases for ogg enabling any of them enables ogg as well.
 2014-08-22 13:23:50 +02:00
Michael Niedermayer
ed8e6d535c Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d' 
* commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d':
  lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.

Conflicts:
	libavformat/avformat.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-13 22:22:52 +02:00
Andrew Stone
afbd4b7e09 lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen. 
The only flags, for now, indicate if metadata was updated and are set after each call to
av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly
as packets might be buffered in AVFormatContext.packet_buffer before being given to the user
in av_read_frame().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-13 16:04:48 +00:00
Michael Niedermayer
329832d779 Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d' 
* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
	libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 02:01:34 +02:00
Michael Niedermayer
c218d8218d Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b' 
* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
  Remove obsolete FF_API_PROBE_MIME cruft.

Conflicts:
	libavformat/avformat.h
	libavformat/format.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:36:21 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' 
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:19:45 +02:00
Anton Khirnov
24c788f487 Remove obsolete FF_API_REFERENCE_DTS cruft. 2014-08-09 16:59:26 +00:00
Anton Khirnov
24e87f7f42 Remove obsolete FF_API_PROBE_MIME cruft. 2014-08-09 16:59:21 +00:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Carl Eugen Hoyos
4b63bcef90 Autodetect jpeg-ls files. 2014-08-08 22:43:15 +02:00
Carl Eugen Hoyos
f73d75384f Autodetect webp files. 2014-08-08 16:14:18 +02:00
James Almer
5c3c67126f lavf/avio: rename url_feof() to avio_feof() 
It's a public function and should use the avio_ namespace

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:22 +02:00
James Almer
5b12b4fc4b lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*() 
The were wrongly being exported and used by libavdevice

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 04:28:11 +02:00
Michael Niedermayer
491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 14:14:13 +02:00
ePirat
e3dc2c86fc libavformat: Add Icecast protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 13:33:44 +02:00
Marvin Scholz
eb9244f202 Add Icecast protocol 
Icecast is basically a convenience wrapper around the HTTP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-08-04 12:56:42 +03:00
Carl Eugen Hoyos
ff9a154157 Add int64_t probesize2 instead of int probesize to AVFormatContext. 
Allows to set a probesize >2G.
Tested-by: Oliver Fromme
 2014-07-30 11:09:25 +02:00
Michael Niedermayer
80a3a6611f Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0' 
* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
	libavformat/format.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:57:42 +02:00