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
0f7ca2d778
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/avio: do not include bprint.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:34:05 +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
Luca Barbato
8c6f430291
mpeg: Suppress a compiler warning on callback type
2014-08-09 21:39:36 +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
Nicolas George
f87db44685
lavf/avio: do not include bprint.h.
...
See f75786f
and 04bc370
.
2014-08-09 15:51:04 +02:00
Michael Niedermayer
f75786f3bc
avformat/avio: Fix "warning: struct AVBPrint declared inside parameter list"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 15:30:03 +02:00
Michael Niedermayer
64d029de41
avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation
...
Fixes assertion failure
Fixes Ticket3822
as a side-effect this makes some mkv files a few bytes smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 05:05:09 +02:00
Mark Reid
d6af706eee
avformat/movenc: write reel_name metadata to tmcd atom
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 03:08:25 +02:00
Carl Eugen Hoyos
4b63bcef90
Autodetect jpeg-ls files.
2014-08-08 22:43:15 +02:00
Michael Niedermayer
a698efbc9d
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
...
* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:31:54 +02:00
Justin Jacobs
87dc8b3af9
avformat/matroskadec: Check avpriv_new_chapter() for failure
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:16:30 +02:00
Marek Fort
d1e750cd51
avformat/mov: Support reading Avid's metadata for DNXHD codec.
...
The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:39:04 +02:00
Carl Eugen Hoyos
f73d75384f
Autodetect webp files.
2014-08-08 16:14:18 +02:00
Luca Barbato
e4c9e59a45
mpeg: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-08 05:22:09 -07:00
Diego Biurrun
454697603e
mpegts: Use av_free() to free memory allocated by av_strdup()
2014-08-08 03:12:57 -07:00
James Almer
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:38 +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
Mark Reid
f1e626a357
avformat/mov: read reel_name metadata from tmcd atom
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:37:55 +02:00
Michael Niedermayer
92a28e9f56
avformat/mpegtsenc: Use av_freep() for pids
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:32 +02:00
Michael Niedermayer
31eaecfee9
avformat/mpegtsenc: Free services array completely on failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:23 +02:00
Michael Niedermayer
12b59e57f3
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:02:10 +02:00
Michael Niedermayer
5f8300afc6
mpegtsenc: Check dynarray_add() for failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:02:10 +02:00
Michael Niedermayer
92deb28945
avformat/mpegtsenc: use the correct deallocation functions
...
Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:01:51 +02:00
Michael Niedermayer
efcf1fcad3
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
...
* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 22:11:37 +02:00
Michael Niedermayer
3224a319c0
Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'
...
* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
mpegts: Avoid unnecessary variable shadowing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 22:06:06 +02:00
Michael Niedermayer
066d776501
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'
...
* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
mpegts: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:42:34 +02:00
Michael Niedermayer
ec0b08d20b
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
...
* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:16:06 +02:00
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: b2880a3de9
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: 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
Michael Niedermayer
b4d4f8f826
Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'
...
* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
http: Refactor http_open_cnx
See: c2a170ac0d
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
gerion.entrup@t-online.de
f2855eb4d7
avformat/movenc: add m4b to list of ipod playable files
...
m4b is the extension used by iDevices to detect audiobooks.
2014-07-30 04:19:58 +02:00
Michael Niedermayer
d38edeee9b
avformat/format: fix memleak and error code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:38:15 +02:00
Michael Niedermayer
4182728c78
avformat/format.c: remove duplicate include, put libavutil includes together
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:35:07 +02:00
Michael Niedermayer
6d69503883
avformat/format: simplify ifdeffery
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:33:10 +02:00
Michael Niedermayer
92de445034
Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'
...
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
matroska: Register mime types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:18:11 +02:00
Michael Niedermayer
8cad746093
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'
...
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
aac: Register the mime type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:12:07 +02:00
Michael Niedermayer
9694695a21
avformat: fix probe mime version checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:02:48 +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
Michael Niedermayer
31e0b5d3cb
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
...
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
avstring: Expose the simple name match function
Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 20:24:42 +02:00
Michael Niedermayer
e066f01539
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
...
* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
avformat: Move av_probe_input* to format.c
Conflicts:
libavformat/format.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 20:02:09 +02:00
Luca Barbato
fa38573cd9
matroska: Register mime types
2014-07-29 17:47:32 +02:00
Luca Barbato
02cf0c9e42
aac: Register the mime type
...
Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
2014-07-29 17:47:32 +02:00
Luca Barbato
3a19405d57
avformat: Use the mime type information in input probe
...
It should provide a quicker guess for elementary streams provided
by http.
2014-07-29 17:47:26 +02:00
Luca Barbato
69e7336b8e
avstring: Expose the simple name match function
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-07-29 17:46:29 +02:00
Nicolas Martyanoff
0c889da8cb
avformat/hlsenc: fix cleanup after avformat_write_header()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 16:24:11 +02:00
Luca Barbato
e253a9e2b3
avformat: Move av_probe_input* to format.c
2014-07-29 15:18:51 +02:00
Michael Niedermayer
60831f441d
Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'
...
* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
dump: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:41:00 +02:00
Michael Niedermayer
8b1e920676
Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'
...
* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8':
mxf: Extract origin information from material and source track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:18:03 +02:00
Michael Niedermayer
4a4d0258ee
Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'
...
* commit 'c9d982aa11a6267611c3770792f0e04b48438348':
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:12:03 +02:00
Carl Eugen Hoyos
63c0b41904
Fix standalone compilation of the adts muxer.
2014-07-28 23:25:54 +02:00
Diego Biurrun
942269fd00
caf: Use correct printf conversion specifiers for POSIX int types
2014-07-28 13:19:05 -07:00
Diego Biurrun
59ca29a560
dump: Use correct printf conversion specifiers for POSIX int types
2014-07-28 13:19:04 -07:00
Marc-Antoine Arnaud
259fe7280d
mxf: Extract origin information from material and source track
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-07-28 22:17:42 +02:00
Marc-Antoine Arnaud
c9d982aa11
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-07-28 22:17:42 +02:00
Michael Niedermayer
57e7d9d929
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
...
* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27 02:16:09 +02:00
Michael Niedermayer
6542e5575f
Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
...
* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27 02:09:41 +02:00
Diego Biurrun
7215fcf840
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
2014-07-26 14:51:16 -07:00
Diego Biurrun
ec4f04da1a
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
2014-07-26 14:51:16 -07:00
Michael Niedermayer
a06fac353c
avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculation
...
libvpx adds very significant delay, which appears normal and we must
buffer all other streams no matter what to interleave them correctly
Fixes Ticket3440
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26 01:11:00 +02:00
Nicolas George
04bc370072
lavf/avio: do not include bprint.h.
...
C++ chokes on the definition of AVBPrint.
Including avio.h from c++ code used to work.
Fix trac ticket #3800 .
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-25 05:37:45 +02:00
Michael Niedermayer
66ae994c54
avformat/segment: re-interleave packets if needed
...
Fixes part of Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 23:22:33 +02:00
Michael Niedermayer
351b22caae
avformat/mux: support re-interleaving packets in ff_write_chained()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 22:39:22 +02:00
Michael Niedermayer
383a04a127
avformat/mux: keep AVPacket fields consistent in ff_write_chained()
...
This might have caused double frees in theory, i do not have a test case
though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 22:33:21 +02:00
Michael Niedermayer
d44b8f0a47
avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit
...
This is somewhat unusual so its better to use warning level than debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 20:25:29 +02:00
Michael Niedermayer
7923aa0fba
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:50 +02:00
Michael Niedermayer
3c6e220a8c
avformat/matroskaenc: Factor mkv_start_new_cluster() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:11 +02:00
Carl Eugen Hoyos
ef21b3d38e
Ignore xing number of frames if the file is larger than indicated.
...
Fixes ticket #3777 .
2014-07-24 15:34:36 +02:00
Michael Niedermayer
8b59ab1af0
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
...
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 02:08:14 +02:00
Diego Biurrun
ce2e858f5b
http: K&R formatting cosmetics
...
Also comment some #endifs and reshuffle headers into canonical order.
2014-07-23 13:57:24 -07:00
Andrey Utkin
8a4c0866dc
avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 18:42:41 +02:00
Michael Niedermayer
01b236b704
avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too
...
Fixes Ticket 3787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 17:41:12 +02:00
Michael Niedermayer
016cca4504
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
...
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
http: Use a constant for the supported header size
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 22:02:48 +02:00
Carl Eugen Hoyos
050d79b6dd
Autodetect big-endian tiff files.
2014-07-22 18:09:14 +02:00
Luca Barbato
7bdd2ff682
http: Use a constant for the supported header size
2014-07-22 16:38:26 +02:00
Stefano Sabatini
44071b0d25
lavf/segment: sanitize segment end time in case last packet do not have a defined duration
...
In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).
2014-07-22 13:53:31 +02:00
Stefano Sabatini
713157484a
lavf/segment: do not allow to create segments with no key-frames
...
Fix trac ticket #3749 .
2014-07-22 13:43:06 +02:00
Andreas Cadhalpun
135ea609ce
libavformat/img2dec.c: Add a long_name to the piped image demuxers
...
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 05:14:44 +02:00
Michael Niedermayer
ab7c67905d
Merge commit '389380c27915b0505fed538cd54c035c891fabd9'
...
* commit '389380c27915b0505fed538cd54c035c891fabd9':
http: Do move the class instantiation in the conditional block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:00:06 +02:00
Michael Niedermayer
e621e6cac6
Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'
...
* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
http: Provide an option to override the HTTP method
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:51:35 +02:00
Michael Niedermayer
c7168d1a22
Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'
...
* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
mpegts: do not export empty language tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:34:12 +02:00
Dale Curtis
70f7006eb3
avformat/mov: Pass through iTunSMPB from MOV.
...
Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:48 +02:00
Dale Curtis
42f3bc4072
avformat/adtsenc: Optionally enable ID3 in ADTS.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:25 +02:00
Luca Barbato
389380c279
http: Do move the class instantiation in the conditional block
...
Remove a warning if https support is disabled.
2014-07-21 22:18:35 +02:00
Luca Barbato
28df1d2411
http: Provide an option to override the HTTP method
...
Certain servers accept only PUT as valid method.
2014-07-21 22:18:35 +02:00
Jan Gerber
fc27e7272e
mpegts: do not export empty language tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-07-21 19:39:31 +00:00
Michael Niedermayer
71e515c180
avformat/sapenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:19:12 +02:00
Jan Gerber
73b7a360d8
matroskaenc: Don't set language to empty string, use "und"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-20 14:03:00 +02:00
Michael Niedermayer
cb169126c5
avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps
...
30000/1001 fps isnt implemented as i dont know which are the correct interleaving parameters,
pointers to the appropriate spec and page are welcome
Fixes Ticket2597
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 20:48:22 +02:00
Michael Niedermayer
a7bb22c5aa
avformat/seek: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 19:44:56 +02:00
Carl Eugen Hoyos
ee88a2080e
Parse dri when receiving jpg via rtp.
...
Based on a patch by contact at iridiummobile ru.
Fixes ticket #3780 .
2014-07-18 23:11:11 +02:00
Carl Eugen Hoyos
0e70266bbf
Write valid free atom when -moov_size is specified.
...
Fixes ticket #3769 .
2014-07-18 23:11:11 +02:00
Stefano Sabatini
526bd7bdfa
lavf/segment: set segment end time when the first packet arrives
...
Avoid negative durations in case there is a single packet in the current
segment, since in that case the end time is still set to the previous
segment end time.
2014-07-17 16:51:51 +02:00
Stefano Sabatini
3d38c99041
lavf/segment: fix weird indent
2014-07-17 16:51:51 +02:00
Stefano Sabatini
b6a8c5245f
lavf/segment: show incoming packet duration in debug message
2014-07-17 16:51:51 +02:00
Stefano Sabatini
5acad50056
lavf/segment: only use reference frames for computing the segment end time
...
This avoids a systematic overestimate of the segments duration when there
are several streams.
Fix trac ticket #3724 .
2014-07-17 16:51:50 +02:00
Michael Niedermayer
88f038ac97
avformat/dv: implement fallback in dv_extract_pack()
...
Fixes Ticket2340
Fixes Ticket2341
Based-on mail from Dave Rice <dave@dericed.com>
Tested-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 15:29:27 +02:00
Michael Niedermayer
e5cb7795fc
Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'
...
* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944':
avpacket: Check for and return errors in ff_interleave_add_packet()
Conflicts:
libavformat/audiointerleave.c
libavformat/internal.h
libavformat/mux.c
See: 4d7c71c364
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 14:20:10 +02:00
Nidhi Makhijani
324ff59444
avpacket: Check for and return errors in ff_interleave_add_packet()
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-17 03:18:46 -07:00
Simon Thelen
fa6716c66d
libavformat/segment: change segment_list_size behavior to match hls_list_size behavior.
...
Make the segment muxer keep segment_list_size segments instead of
segment_list_size + 1 segments. This patch also changes the
documentation for segment_list_size to reduce possible confusion over
how many segments are kept.
this allows the segment list to
be limited to containing only one segment which used to be impossible
because a segment_list_size of 0 kept all the segments and a
segment_list_size of 1 kept 2 segments.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 02:35:56 +02:00
Michael Niedermayer
37a0ac1d82
avformat: Micro bump for "md5enc: add format_version, to allow selecting which version to use"
...
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 22:58:29 +02:00
Michael Niedermayer
7da2592f56
avformat/md5enc: add format_version, to allow selecting which version to use
...
Currently there is just version 1
Fixes remaining part of Ticket2280
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 22:50:24 +02:00
Michael Niedermayer
e240d01c12
avformat/matroskadec: fix declaration after statement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 00:06:15 +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
Vignesh Venkatasubramanian
5a20656946
lavf/matroska: Add functions for WebM DASH Manifest
...
Add functions and logic to matroskadec for use by the WebM DASH Manifest
XML Muxer. The actual muxer is added in a future patch.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 23:56:17 +02:00
Michael Niedermayer
62227a70f0
avformat: add av_stream_get_parser() to access avformat AVParser
...
The AVStream.parser field is considered private and its location cannot be
preserved while preserving also ABI compatibility to libav, as libav added fields
before it.
Some tools like ffmpeg.c access this field though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 21:17:20 +02:00
Michael Niedermayer
6821572499
avformat/movenc: dont mark multichannel as mono tracks as containing the center channel
...
Fixes Ticket3727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 17:11:11 +02:00
Michael Niedermayer
47c84c0bf7
avformat/wavdec: add basic sanity check for the sample count
...
Fixes Ticket3708
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 14:52:18 +02:00
Michael Niedermayer
2db1bcf1b9
avformat/asfdec: Try to improve skip case
...
Fixes Ticket3761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 01:16:08 +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
Michael Niedermayer
4eb13cdfb0
avformat/asfdec: dvrms timestamps are pts not dts
...
Should fix Ticket3328
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 03:50:47 +02:00
Michael Niedermayer
8202c49b43
avformat/utils: do not wait for packets from discarded streams for genpts
...
Fixes long loop
Fixes Ticket3208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 01:07:59 +02:00
Michael Niedermayer
4470a3eeaf
avformat/mpegts: dont clear programs during probing
...
Fixes Ticket 3763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-12 21:49:15 +02:00
Lukasz Marek
ca671beead
lavf/libssh: set freed pointers to NULL
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-12 03:01:38 +02:00
Paul B Mahol
6779bf3f0f
avformat/wavenc: use av_mallocz_array()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-07-11 10:38:45 +00:00
Michael Niedermayer
c6c172d173
avformat/mpegts: skip updating programs/streams when determining duration
...
Fixes Ticket2441
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 16:43:27 +02:00
Michael Niedermayer
375d7ee805
Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
...
* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
mov: Clarify tkhd flag settings
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 13:07:26 +02:00
Michael Niedermayer
4c91599484
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
...
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
mov: Do not group tracks if more than one is enabled per type
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 12:41:57 +02:00
Luca Barbato
df2aa22203
mov: Clarify tkhd flag settings
2014-07-11 11:07:35 +02:00
Luca Barbato
f90729699d
mov: Do not group tracks if more than one is enabled per type
...
The specification requires at most 1 track enabled per alternate group.
2014-07-11 11:07:06 +02:00
Michael Niedermayer
0089fb79cc
avformat/cdg: Do not fail if filesize cannot be determined
...
This fixes cdg with piped input which was broken by the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 01:04:04 +02:00
Michael Niedermayer
20ad2152dd
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
...
* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
cdg: Forward error from avio_size() in read_header() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-11 01:03:50 +02:00
Nidhi Makhijani
44386aaad8
cdg: Forward error from avio_size() in read_header() function
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-10 12:38:54 -07:00
Alexander V. Lukyanov
5adcef9c1b
mpegts: pass MpegTSContext ptr explicitly
...
AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.
Within libav, the write_section_data function doesn't actually use
the MpegTSContext at all, so this doesn't change anything at the
moment (no memory was corrupted before), but it reduces the risk of
anybody trying to touch the MpegTSContext via AVFormatContext->priv_data
in the future.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-10 11:24:19 +03:00
Nicolas Martyanoff
6cc1fec412
avformat/hlsenc: correctly compute target duration
...
With HLS, the duration of all segments must be lower or equal to the target
duration. Therefore floor(duration + 0.5) yields incorrect results.
For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the
correct result is 2.0.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-07-10 01:31:04 +03:00
Michael Niedermayer
19b9e07ef5
Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'
...
* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
rtpdec: pass an AVFormatContext to ff_parse_fmtp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:40:13 +02:00
Michael Niedermayer
f233666880
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
...
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
yuv4mpegenc: do not access AVCodecContext.coded_frame
Conflicts:
libavformat/yuv4mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:34:33 +02:00
Michael Niedermayer
57fa9e9742
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
...
* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
nsvdec: remove commented out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:26:18 +02:00
Michael Niedermayer
73b1283012
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
...
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
mov: free the dv demux context with avformat_free_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:19:06 +02:00
Michael Niedermayer
81babc432a
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
...
* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
mtv: do not set sample_rate for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:11:09 +02:00
Michael Niedermayer
d52f874c7f
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
...
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
oggparsecelt: do not set AVCodecContext.frame_size
Conflicts:
libavformat/oggparsecelt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 22:48:25 +02:00
Michael Niedermayer
e932ae5940
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
...
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 22:38:13 +02:00
Michael Niedermayer
1b58f13761
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
...
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
lavc: export DV profile API used by muxer/demuxer as public
Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 22:27:07 +02:00
Michael Niedermayer
4b13ec69c6
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
...
* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
avformat: update muxing doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 21:38:27 +02:00
Michael Niedermayer
714d9bd6ee
Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'
...
* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
cdg: set the keyframe flag on the first packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 21:30:45 +02:00
Michael Niedermayer
b83e0903ec
avformat/m4vdec: raise threshold slightly for detection
...
Fixes Ticket3746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 17:02:34 +02:00
Anton Khirnov
0307cc2253
rtpdec: pass an AVFormatContext to ff_parse_fmtp()
...
Use it for logging, instead of NULL or the stream codec context.
2014-07-09 13:40:54 +00:00
Anton Khirnov
650d384048
yuv4mpegenc: do not access AVCodecContext.coded_frame
...
Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).
Use AVCodecContext.field_order instead.
2014-07-09 13:40:39 +00:00
Anton Khirnov
27c1f82f56
nsvdec: remove commented out cruft
2014-07-09 13:38:54 +00:00
Anton Khirnov
edb1af7c46
mov: free the dv demux context with avformat_free_context()
2014-07-09 13:38:35 +00:00
Anton Khirnov
a14b61658c
mtv: do not set sample_rate for video
2014-07-09 13:38:26 +00:00
Anton Khirnov
b8604a9761
oggparsecelt: do not set AVCodecContext.frame_size
...
It is supposed to be set by decoders only.
2014-07-09 13:38:14 +00:00
Anton Khirnov
d5cf5afabb
adxdec: get rid of an avpriv function
...
The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.
2014-07-09 13:37:18 +00:00
Anton Khirnov
f6ee61fb05
lavc: export DV profile API used by muxer/demuxer as public
2014-07-09 13:35:07 +00:00
Anton Khirnov
c9c1265c52
avformat: update muxing doxy
...
The callers should now set the stream timebase, not the codec one.
2014-07-09 13:30:22 +00:00
Anton Khirnov
abda15a990
cdg: set the keyframe flag on the first packet
...
Bug-Id: 55
2014-07-09 13:30:11 +00:00
Mark Boorer
352756ecae
avformat/movenc: respect color_range when encoding dnxhd.
...
Set the ACLR atom appropriately for legal / full range.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 00:35:23 +02:00
Michael Niedermayer
7125b6ca90
avformat/segment: remove gettimeofday() use, remove sys/time.h
...
It causes portability issues, and would need ifdef hell if its kept
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 22:52:39 +02:00