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

16186 Commits

Author SHA1 Message Date
Marek Fort
4e70104aba avformat/movenc: XMP metadata support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 20:11:09 +02:00
Marek Fort
054c506e3d avformat/mov: XMP metadata suppor. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 20:11:09 +02:00
Diego Biurrun
5b220e1e19 mpegts: Fix memory leaks and related crashes in mpegs_write_header() 2014-08-07 07:52:17 -07:00
Diego Biurrun
f8ab9f2fe3 mpegts: Avoid unnecessary variable shadowing 2014-08-07 07:52:17 -07:00
Diego Biurrun
6d6bd3a3db mpegts: Drop some unnecessary parentheses 2014-08-07 07:52:17 -07:00
Diego Biurrun
b7b1bf9166 mpegts: K&R formatting cosmetics 2014-08-07 07:48:54 -07:00
James Almer
350f4be12d lavf: remove nonexistent functions from the version file 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 13:35:35 +02:00
James Almer
0ab00a75e4 avcodec/raw: add avpriv_get_raw_pix_fmt_tags() 
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 12:52:38 +02:00
Michael Niedermayer
4c404611da Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 12:17:35 +02:00
Carl Eugen Hoyos
7c73d21523 lavf/mpegts: Do not return the result of a (void) function from a void function. 
Fixes compilation with Sun C 5.10.
 2014-08-07 09:55:40 +02:00
Carl Eugen Hoyos
ef17a0c7ba Do not return a probe score from set_codec_from_probe_data() if the codec was ignored. 
This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821.
 2014-08-07 09:12:34 +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
1c59419419 Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929' 
* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
  movenc: fix QT chapter track character encoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 02:54:23 +02:00
Michael Niedermayer
403367d5a9 Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323' 
* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
  movenc: add track title to tracks

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 02:42:15 +02:00
Michael Niedermayer
71f33051e5 Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed' 
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
  movenc: remove pointless loop around BITEXACT test

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 02:35:39 +02:00
Michael Niedermayer
6a44699746 avformat/dtsdec: check more of the dca headers in dts_probe() 
Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-06 22:28:46 +02:00
John Stebbins
b50173a4dd movenc: fix QT chapter track character encoding 
An encoding ("encd") box is required to tell QT that the string is UTF8
 2014-08-06 13:27:17 -07:00
John Stebbins
da9cc22d5b movenc: add track title to tracks 2014-08-06 13:27:17 -07:00
John Stebbins
d9432789bd movenc: remove pointless loop around BITEXACT test 2014-08-06 13:27:17 -07:00
Michael Niedermayer
592a854f8c avformat/iff: Fix "source comment" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 18:16:46 +02:00
Michael Niedermayer
a53a107a2f Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c' 
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
  movenc: Add option to disable nero chapters

Conflicts:
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 13:58:10 +02:00
Michael Niedermayer
2e2e6b1be5 Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e' 
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
  mpegts: Add HEVC definitions

Conflicts:
	libavformat/mpegts.h

See: b2880a3de9e3e160c47c069abcc8cb60015407b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 13:52:32 +02:00
Michael Niedermayer
94d4f9d405 Merge commit '89616408e38ac7257e36976723df0e23d6ee1157' 
* commit '89616408e38ac7257e36976723df0e23d6ee1157':
  mpegts: Define the section length with a constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 13:45:26 +02:00
John Stebbins
0897d2fdc7 movenc: Add option to disable nero chapters 
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-05 11:36:08 +02:00
Femi Adeyemi-Ejeye
2601a9447e mpegts: Add HEVC definitions 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-05 11:30:50 +02:00
Luca Barbato
89616408e3 mpegts: Define the section length with a constant 
The specification says the value is expressed in 10 bits including
the 4-byte CRC.
 2014-08-04 22:22:54 +02:00
Michael Niedermayer
4e855c11b5 avformat/util: change av_find_default_stream_index() to use a score based system 
Disfavor video streams with unknown resolution and no packets
Fixes seeking in audio-only-speex.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 18:06:26 +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: e3dc2c86fc4178b100484c54f12c88705cdf6724
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
Michael Niedermayer
b4d4f8f826 Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc' 
* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

See: c2a170ac0ddd53516d004cd2bf55ceaffa59642a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 03:44:11 +02:00
Rodger Combs
c2a170ac0d avformat/http: fix tls/tcp protocol after a 302 move in https 
Fixes ticket 3824

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 03:33:40 +02:00
Luca Barbato
6a463e7fb4 http: Refactor http_open_cnx 
Split return value handling from the actual opening.

Incidentally fixes the https -> http redirect issue reported by
Compn on behalf of rcombs.

CC: libav-stable@libav.org
 2014-08-03 23:13:27 +02:00
Michael Niedermayer
6cdf409884 avformat/mpegtsenc: do not flush after everything 
there is flushing code in the avformat core that does this in a more
controlled way.

Fixes ticket2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 18:10:04 +02:00
Michael Niedermayer
fee982048e avformat/mux: flush after header writing, like after packets 
This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 18:10:04 +02:00
Michael Niedermayer
2e6fdcb7f3 avformat/tee: flip assigment direction 
Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 03:18:52 +02:00
Michael Niedermayer
2b501b553f avformat/dtsdec: skip the first 4k in dts_probe() 
DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.

If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed

Fixes ticket3784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 17:25:04 +02:00
Michael Niedermayer
e6fabd6e9b avformat/dtsdec: fix signedness in reference pcm highpass in dts_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 17:24:42 +02:00
Michael Niedermayer
dd551dc7ff avformat/dtsdec: count LE and BE separately in dts_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 17:21:03 +02:00
Michael Niedermayer
98e42a249e avformat/format: Check for av_guess_format() failure 
Fixes null pointer dereference
Fixes Ticket3812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 04:16:02 +02:00
Michael Niedermayer
26ffa8eaee avformat/format: use av_match_name() in av_guess_codec() 
Fixes part of Ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 03:39:38 +02:00
Michael Niedermayer
afd62b3f18 Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529' 
* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
  flv: Index the audio stream

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 21:34:31 +02:00
Luca Barbato
fa14804c83 flv: Index the audio stream 
And leverage the video index if the video is just disabled as wm4
did in an initial patch.
 2014-08-01 15:04:51 +02:00
Nicolas Martyanoff
467e9d6186 avformat/hlsenc: add some empty lines to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:33:49 +02:00
Nicolas Martyanoff
706fcffce1 avformat/hlsenc: rename some identifers to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:31:49 +02:00
Nicolas Martyanoff
53f10e0368 avformat/hlsenc: Add some comments to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:04:05 +02:00
Reimar Döffinger
1c84aad718 movdec: remove nonsensical snprintf. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02:00
Reimar Döffinger
04aec74f45 mxfdec: add missing "const" to array declaration. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02: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
Carl Eugen Hoyos
355121bcb5 lavf/mux: Fix a typo checking aspect ratios. 
Fixes ticket #3813.
 2014-07-30 11:03:29 +02:00