Carl Eugen Hoyos
fddea3f074
Check for hevc startcode when muxing into mpeg-ts.
2014-08-12 08:48:20 +02:00
Reimar Döffinger
2c0454cd20
Add missing initialization for AVProbeData.
...
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-11 21:10:22 +02:00
James Almer
7b3de03c8f
lavf: stop exporting internal functions
...
Except for those currently used by ffserver.
Signed-off-by: James Almer <jamrial@gmail.com>
Also left some others that seemed used by applications other than ffserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 14:29:56 +02:00
James Almer
31b7ab9f06
lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 13:46:53 +02:00
Michael Niedermayer
49456a95eb
avformat/movenc: Fix printf type
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 00:09:09 +02:00
Mark Reid
cab39afb1a
avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 21:32:05 +02:00
Michael Niedermayer
d123d9abef
Merge commit ' 8dca0877e3'
...
* commit '8dca0877e3 ':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 20:34:28 +02:00
Carl Eugen Hoyos
273fc0139e
lavf/img2dec: Initialize a stack variable.
...
Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.
2014-08-10 18:20:12 +02:00
Nidhi Makhijani
8dca0877e3
mpegts: Return proper error code on invalid input data
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-10 07:24:30 -07:00
Michael Niedermayer
e18d9d90f1
Merge commit ' 8c6f430291'
...
* commit '8c6f430291 ':
mpeg: Suppress a compiler warning on callback type
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 02:20:54 +02:00
Michael Niedermayer
329832d779
Merge commit ' 24c788f487'
...
* commit '24c788f487 ':
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 ' 24e87f7f42'
...
* commit '24e87f7f42 ':
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 ' 1985c2e75c'
...
* commit '1985c2e75c ':
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 ' f4c444e17d'
...
* commit 'f4c444e17d ':
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 ' e4c9e59a45'
...
* commit 'e4c9e59a45 ':
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 ' 5b220e1e19'
...
* commit '5b220e1e19 ':
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 ' f8ab9f2fe3'
...
* commit 'f8ab9f2fe3 ':
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 ' 6d6bd3a3db'
...
* commit '6d6bd3a3db ':
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 ' b7b1bf9166'
...
* commit 'b7b1bf9166 ':
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