RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,518 Commits 36 Branches 398 Tags 225 MiB
Commit Graph

15169 Commits

Author SHA1 Message Date
Michael Niedermayer dff4aa6afd Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104' 
* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 13:08:50 +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
Michael Niedermayer 1c0ce2d4e0 Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0' 
* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:49:28 +02:00
Michael Niedermayer 69de229bb8 Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c' 
* commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c':
  matroskadec: split parsing tracks into a separate function

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:41:35 +02:00
Michael Niedermayer 40beec6a43 Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0' 
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:33:49 +02:00
Michael Niedermayer 61301ca786 Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c' 
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:28:23 +02:00
Michael Niedermayer 03ffaed3f0 Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd' 
* commit 'd6b9ce99ea384fb676561461768b8316725a4ccd':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:21:50 +02:00
Anton Khirnov efcde917af vorbiscomment: simplify API by using av_dict_count() 2014-05-28 07:54:54 +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
Anton Khirnov 4efdadc8ec matroskadec: export just the STREAMINFO block as FLAC extradata 
It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
 2014-05-28 07:49:15 +02:00
Anton Khirnov 6df478bf89 matroskadec: split parsing tracks into a separate function 2014-05-28 07:48:59 +02:00
Anton Khirnov 5fdaf312c5 flac: make avpriv_flac_parse_block_header() inline 
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
 2014-05-28 07:48:30 +02:00
Anton Khirnov 54ed488b1a flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files 2014-05-28 07:47:31 +02:00
Anton Khirnov d6b9ce99ea flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag 
It is used to store the channel mask for non-standard layouts.
 2014-05-28 07:47:15 +02:00
Lazaros Koromilas bbc10a1aa5 libavformat/utils: Fix segfault on m4a cover artwork parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 03:35:39 +02:00
Michael Niedermayer 919c320f72 avformat/oggenc: fix EOS flag 
This corrects the bug that caused the checksums to change in
9767d7c092

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 01:12:18 +02:00
Michael Niedermayer b5657516b2 Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b' 
* commit '9767d7c092c890ecc5953452e8a951fd902dd67b':
  oggenc: Flush after writing headers

Conflicts:
	tests/ref/lavf/ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 01:00:10 +02:00
Michael Niedermayer 5313d60dc0 Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1' 
* commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1':
  oggenc: Move ogg_write_pages up above ogg_write_header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 00:28:08 +02:00
Michael Niedermayer 5be8c27694 avformat/rtspdec: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Andrew Kelley 9767d7c092 oggenc: Flush after writing headers 
Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:59 +03:00
Andrew Kelley 1d3eb0b573 oggenc: Move ogg_write_pages up above ogg_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:58 +03:00
Michael Niedermayer e6a084641a avformat/utils: set max analyze duration depending on the circumstances 
Fixes Ticket3673

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 22:33:01 +02:00
Michael Niedermayer 52887aa409 avformat: move default for max_analyze_duration into utils.c 
this way we can do better tha a single fixed constant value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 22:33:01 +02:00
Carl Eugen Hoyos 2d56f0d054 Write the actual mp3 frame size when muxing into caf if available. 
Fixes ticket #3648.
 2014-05-26 20:28:07 +02:00
Michael Niedermayer 96470ca22b avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe 
Fixes Ticket 3663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 01:23:46 +02:00
Michael Niedermayer d236d4907c update APIchanges & version for c37d179 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 00:20:07 +02:00
Michael Niedermayer c37d179295 avformat: add format_probesize to allow tuning the maximum amount of bytes to identify the filetype 
Currently probesize is cliped at 1mb before being used for format detection.
Alternatively this cliping could be removed but this would then tie various
things like stream analysis to the file detection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-25 23:54:34 +02:00
Michael Niedermayer ee9b0199c8 Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9' 
* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-25 13:07:45 +02:00
Aman Gupta 4372fb7a57 avcodec/webvttenc: add webvtt encoder 
Based off the srt encoder. The following features are unimplemented:

- fonts, colors, sizes
- alignment and positioning

The rest works well. For example, use ffmpeg to convert subtitles into the .vtt format:

  ffmpeg -i input.srt output.vtt

Signed-off-by: Aman Gupta <ffmpeg@tmm1.net>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-05-25 03:04:14 +02:00
Michael Niedermayer 726316240b Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87' 
* commit '8692e6284f5169257a537c8fc25addf32fc67c87':
  rdt: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-24 13:21:33 +02:00
Clément Bœsch cba92a2226 avformat/vobsub: do not create empty streams. 
Fixes NULL dereference in vobsub_read_packet() on vobsub->q[i]->subs.

Fixes ticket #3669.
 2014-05-24 11:08:34 +02:00
Nidhi Makhijani e0d01dc7d7 smoothstream: check malloc calls 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-24 08:21:49 +02:00
Nidhi Makhijani 8692e6284f rdt: check malloc calls 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-24 07:51:12 +02:00
Clément Bœsch e63a17bfdc avformat/mov: use av_display_rotation_get() for rotate metadata. 2014-05-23 23:30:21 +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 64bf845544 avformat/mov: Dont blindly trust the stream duration in seting chapter times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-23 04:39:55 +02:00
Michael Niedermayer 220df143b9 avformat/utils: Check end time in avpriv_new_chapter() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-23 04:33:05 +02:00
Michael Niedermayer 744df0a031 avformat/movenc: Check that packet duration is valid in ff_mov_write_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-23 04:00:29 +02:00
Florent Le Coz fdcb2873e1 Fix the mime types for MPEG and MPEG-TS formats 
As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003
 2014-05-22 23:34:59 +02:00
Vignesh Venkatasubramanian 37cef8c774 libavformat/matroskaenc: Add WebM DASH support 
WebM DASH specification [1] requires the Clusters and Cues to be output in a
specific way. Adding a flag to matroskaenc that will enable support for
creating WebM/Mkv files conforming to the WebM DASH specification.

[1] http://wiki.webmproject.org/adaptive-streaming/webm-dash-specification

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-22 18:53:13 +02:00
Carl Eugen Hoyos eff913c972 Autodetect Asterisk raw pcm with extension "sln". 2014-05-22 15:15:04 +02:00
Carl Eugen Hoyos afaa39b46d Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr(). 
Fixes ticket #3660.
 2014-05-21 22:48:11 +02:00
Michael Niedermayer 7f7080dc73 avformat: add av_stream_get_end_pts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-21 18:53:12 +02:00
Michael Niedermayer 7d25af1547 Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37' 
* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
  lavf: add av_stream_get_side_data

Conflicts:
	doc/APIchanges
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-20 03:39:04 +02:00
Michael Niedermayer 9893e883ea avformat/mux: Remove localized encoder strings 
Fixes muxing to end up with a encoder=Lavf... and encoder_eng=somethingelse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-20 02:46:42 +02:00
Janne Grunau c23c96b638 lavf: add av_stream_get_side_data 2014-05-20 00:43:52 +02:00
Lukasz Marek b9419b5882 lavf/ftp: favour EPSV over PASV command 
EPSV is newer version of PASV and allows to use IPv6.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:45 +02:00
Lukasz Marek 37fa4b9bb9 lavf/audiointerleave: return more meaningful error codes 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:45 +02:00
Lukasz Marek 2ed9e17ed1 lavf/audiointerleave: check for allocation failure 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:45 +02:00
Lukasz Marek c61cdefa4d lavf/audiointerleave: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:45 +02:00