Paul B Mahol
dc3c3758ce
avformat/thp: check av_get_packet() for failure
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-06 09:42:53 +00:00
James Almer
15a88468ae
avformat/tta: only check for header and seek table crc if requested
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-05 23:20:40 -03:00
Carl Eugen Hoyos
afada9ac67
Fix compilation with --disable-protocol=udp
2015-02-05 10:07:03 +01:00
Michael Niedermayer
f2579dbb4b
avformat/thp: Check av_get_packet() for failure not only for partial output
...
Fixes null pointer dereference
Fixes: signal_sigsegv_db2c1f_3108_cov_163322880_pikmin2_opening1_partial.thp
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 04:14:42 +01:00
Lukasz Marek
21051af218
lavf/avc: add buffer padding to extradata allocation
...
ff_avc_write_annexb_extradata() allocates extradata, but don't add
FF_INPUT_BUFFER_PADDING_SIZE value
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-02-05 03:27:55 +01:00
Michael Niedermayer
05e1619529
avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 14:55:42 +01:00
Paul B Mahol
469a170135
avformat/siff: fix if_( style
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 13:10:53 +00:00
Stefano Sabatini
fd242b468d
lavf/utils: fix if_( style
2015-02-04 13:17:30 +01:00
wm4
b737a2c528
avformat/mpc8: fix broken pointer math
...
This could overflow and crash at least on 32 bit systems.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 00:55:47 +01:00
wm4
56cc024220
avformat/mpc8: fix hang with fuzzed file
...
This can lead to an endless loop by seeking back a few bytes after each
attempted chunk read. Assuming negative sizes are always invalid, this
is easy to fix. Other code in this demuxer treats negative sizes as
invalid as well.
Fixes ticket #4262 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 00:39:56 +01:00
Michael Niedermayer
d304cb49eb
Merge commit '898276c16b1683ac77723e97574a3bfdb29507fd'
...
* commit '898276c16b1683ac77723e97574a3bfdb29507fd':
r3d: Fix pos type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 00:04:49 +01:00
Michael Niedermayer
bd12634d6b
Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'
...
* commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de':
tta: Fix framepos and start_offset types
Conflicts:
libavformat/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 23:49:14 +01:00
Michael Niedermayer
e005dc621a
avformat: fix mode of img2dec.c and utils.c
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 22:27:23 +01:00
Michael Niedermayer
a83e0639c0
Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'
...
* commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f':
mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom
Conflicts:
libavformat/mov.c
See: b76bc01034
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 22:19:46 +01:00
Michael Niedermayer
deeba777ad
Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'
...
* commit '27b99d929fe3440b4bba8e5d970c2802f274f328':
siff: Return more meaningful error values
Conflicts:
libavformat/siff.c
See: 29c3ebf56e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 22:05:00 +01:00
Michael Niedermayer
46a16ca15a
Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'
...
* commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128':
siff: K&R formatting cosmetics
Conflicts:
libavformat/siff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 21:53:29 +01:00
Liviu Oniciuc
b37858eae1
avformat/img2dec: remove the non-negative number requirement for start_number option
...
industrial cameras usually mark the trigger frame as frame number 0
all frames saved before trigger frame receive a negative sequence number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 18:57:23 +01:00
Luca Barbato
898276c16b
r3d: Fix pos type
...
avio_tell can return a negative number.
Bug-Id: CID 1265715
CC: libav-stable@libav.org
2015-02-03 15:23:22 +00:00
Vittorio Giovara
ec524ed12a
tta: Fix framepos and start_offset types
...
Also propagate errors.
CC: libav-stable@libav.org
Bug-Id: CID 1238812
2015-02-03 15:23:21 +00:00
Carl Eugen Hoyos
67e9f3907d
isom: Decode Prores 4444 XQ with the existing Prores decoder
...
The frames seem to contain a higher bitrate which our decoder is
able to handle.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-03 15:23:21 +00:00
Hendrik Leppkes
e3528d2a7b
mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom
...
This atom typically is used for a track title. The handler name is stored
as a Pascal string in the QT specs (first byte is the length of the string),
so do not export it.
A second length check based on the first character is added to avoid
overwriting an already specified handler_name (it happens with YouTube
videos for instance, the handler_name get masked), or specifying an
empty string metadata.
The Pascal string fix and the second length check are written
by Clément Bœsch <clement.boesch@smartjog.com>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-03 15:15:12 +00:00
wm4
6a0cd529a3
avformat/tta: fix crash with corrupted files
...
av_add_index_entry() can fail, for example because the parameters are
invalid, or because memory allocation fails. Check this; it can actually
happen with corrupted files.
The second hunk is just for robustness. Just in case functions like
ff_reduce_index() remove entries. (Not sure if this can actually
happen.)
Fixes ticket #4294 .
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 16:02:32 +01:00
Diego Biurrun
27b99d929f
siff: Return more meaningful error values
2015-02-03 14:55:40 +00:00
Diego Biurrun
75439bb31b
siff: K&R formatting cosmetics
2015-02-03 14:53:44 +00:00
Matt Oliver
22504396fe
avformat/mpegtsenc: Fix build with msvc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 15:15:50 +01:00
Michael Niedermayer
ed91c8651a
avformat/mov: simplify pasp value before setting SAR
...
This avoids a 65536:65536 SAR
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 14:11:20 +01:00
Michael Niedermayer
7620d48f2e
avformat/network: Check for av_malloc* failures in ff_tls_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 02:21:55 +01:00
Michael Niedermayer
c348a42dcc
Revert "avformat/mpegtsenc: Change the service_type field to enum"
...
This isnt safe due to AVOption accessing this field as int
i just realized a moment after pushing
This reverts commit 0935453e84
.
2015-02-02 22:30:56 +01:00
Michael Niedermayer
0935453e84
avformat/mpegtsenc: Change the service_type field to enum
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 22:15:39 +01:00
dhead666
48e36f8a12
libavformat/mpegtsenc: allow to set service_type in sdt
...
This adds an option to set the service type in mpegts as defined in ETSI 300 468.
I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).
I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.
The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.
This close issue 4118.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 22:02:26 +01:00
Michael Niedermayer
f1f7f5903a
avformat/omadec: fix number suffix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
Michael Niedermayer
465f3705b1
avformat/smacker: Fix number suffix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
Michael Niedermayer
fc3cdb00d0
avformat/matroskadec: Fix number suffixes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
Michael Niedermayer
4b15bba2ae
avformat/utils: Fix number suffixes in tb_unreliable()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 19:19:25 +01:00
Michael Niedermayer
e912f45b81
avformat/oggenc: Simplify by using OFFSET and PARAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 14:35:15 +01:00
Michael Niedermayer
9bacb576bc
Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'
...
* commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16':
ogg: Provide an option to offset the serial number
Conflicts:
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 13:22:21 +01:00
Luca Barbato
f726fc21ef
ogg: Provide an option to offset the serial number
...
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
2015-02-01 02:28:40 +01:00
Zhang Rui
ca2e3e47fc
avformat/cache: pass options to the underlying protocol via the url_open2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 18:55:46 +01:00
Paul B Mahol
f705b1287b
avformat/movenc: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:07 +00:00
Paul B Mahol
cc1357a173
avformat/mov: remove unneeded #include, there are no assert()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:07 +00:00
Paul B Mahol
41456c7d15
avformat/mux: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:07 +00:00
Paul B Mahol
12c5addebc
avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:07 +00:00
Paul B Mahol
ca8617a04d
avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:06 +00:00
Paul B Mahol
43630c82f1
avformat/utils: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:06 +00:00
Paul B Mahol
80cbf13725
avformat/rtpdec_qdm2: change assert to av_assert0()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 15:32:10 +00:00
Paul B Mahol
64815d1f0c
avformat/nut: support WavPack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 09:33:49 +00:00
Paul B Mahol
b5004f3213
avformat/nut: add GIF[0]
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 08:58:33 +00:00
Michael Niedermayer
c2ad22ff99
Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
...
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
yuv4mpegdec: initialize field_order in yuv4_read_header()
Conflicts:
libavformat/yuv4mpegdec.c
See: 52a17972de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 21:55:02 +01:00
Vittorio Giovara
08fa34bf75
yuv4mpegdec: initialize field_order in yuv4_read_header()
...
CC: libav-stable@libav.org
Bug-Id: CID 1265721
2015-01-29 15:26:33 +00:00
Zhang Rui
038f3a173f
avformat/concatdec: avoid NULL dereference when failed to open file.
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 14:25:04 +01:00
Michael Niedermayer
58ed152857
avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers
...
This undoes the effect of 3c18a7b188
for reading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 20:56:50 +01:00
Michael Niedermayer
0b4fc4bacd
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
...
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
avio: Do not consider the end-of-buffer position valid
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 20:37:28 +01:00
Paul B Mahol
c099783316
avformat/nsvdec: remove case which is no longer possible
...
Check of channels !=0 is right above.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-28 17:57:48 +00:00
Luca Barbato
3c18a7b188
avio: Do not consider the end-of-buffer position valid
...
Trigger a refill if the seek action moves the pointer
at the end of the buffer.
Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.
In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.
CC: libav-stable@libav.org
2015-01-28 16:28:10 +01:00
Carl Eugen Hoyos
449b8cf04b
avformat/mxfdec: Fix cleanup in mxf_free_metadataset()
...
Fixes Ticket4256
Found-by: tholin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 05:26:01 +01:00
Michael Niedermayer
f955abe333
Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'
...
* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
nuv: validate image size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 20:13:07 +01:00
Michael Niedermayer
b04cbbe255
Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'
...
* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
nsvdec: validate channels and samplerate
See: d633e15d7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 19:53:50 +01:00
Michael Niedermayer
6d34665c76
Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'
...
* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
mov: export audio service type as side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:32:23 +01:00
Michael Niedermayer
0bdcc27d95
Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'
...
* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
lavf: add a convenience function for adding side data to a stream
Conflicts:
libavformat/internal.h
libavformat/replaygain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:16:42 +01:00
Michael Niedermayer
b44456c908
Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'
...
* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
nutenc: do not use has_b_frames
Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut
Mostly not merged, this is simply not correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 17:52:06 +01:00
Vittorio Giovara
e71149a7a5
nuv: validate image size
...
Avoid a division by zero.
CC: libav-stable@libav.org
Bug-Id: CID 717750
2015-01-27 15:26:37 +00:00
Vittorio Giovara
7c51d79ca7
nsvdec: validate channels and samplerate
...
Avoid a division by zero.
CC: libav-stable@libav.org
Bug-Id: CID 717749
2015-01-27 15:26:37 +00:00
Michael Niedermayer
be023405a7
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
...
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
avidec: do not export stream_codec_tag
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 16:17:42 +01:00
Anton Khirnov
3212578148
mov: export audio service type as side data
2015-01-27 09:21:28 +01:00
Anton Khirnov
4227e4fe74
lavf: add a convenience function for adding side data to a stream
2015-01-27 09:18:32 +01:00
Anton Khirnov
80a11de7dc
nutenc: do not use has_b_frames
...
It is unreliable, especially when the stream codec context is not the
encoding context. Use the codec descriptor properties instead.
2015-01-27 09:15:07 +01:00
Anton Khirnov
f771b3ab5d
avidec: do not export stream_codec_tag
...
Handle its only existing use case internally.
2015-01-27 09:13:45 +01:00
Kevin Wheatley
7b6f419176
avformat/movenc: Add simplistic 'colr' tag writing support to mov container
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 17:49:50 +01:00
Carl Eugen Hoyos
fe47cba7e8
Decode Prores 4444 XQ with the existing Prores decoder.
...
The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.
2015-01-26 12:05:14 +01:00
Michael Niedermayer
da048c6d24
avformat/movenc: Check failure of allocation of ctts_entries and propagate error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 14:32:22 +01:00
Michael Niedermayer
47785b44b5
avformat/movenc: fix cleanup on insufficient reserved_moov_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 14:28:43 +01:00
Michael Niedermayer
a1062e1437
avformat/matroskadec: Use av_malloc_array() for index_entries
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 00:26:53 +01:00
Michael Niedermayer
c1cdce5dcb
avformat/matroskadec: Check av_mallocz() return values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25 00:26:39 +01:00
Michael Niedermayer
0c00e734ef
Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'
...
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
hlsproto: Properly close avio buffer in case of error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 22:27:48 +01:00
Michael Niedermayer
72d99c8c26
avformat/dv: check av_malloc() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 18:15:43 +01:00
Michael Niedermayer
d36e66bb26
avformat/librtmp: Fix build with --disable-network --enable-librtmp
...
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 17:45:35 +01:00
Vittorio Giovara
3a6dfec864
segment: Check av_get_frame_filename() return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1265713
2015-01-23 14:55:03 +00:00
Vittorio Giovara
7915e6741d
hlsproto: Properly close avio buffer in case of error
...
Fix a memory leak.
CC: libav-stable@libav.org
Bug-Id: CID 717999
2015-01-23 14:55:03 +00:00
Vittorio Giovara
4c5fa628da
mov: Do not compute negative SAR values
...
This partially reverts cf70ba37ba
, since
it didn't take into account when rotation is 0, but there is another
valid operation (eg. translation) in the matrix.
Found-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 14:54:59 +00:00
Jon Morley
47372caac5
libavformat/mov.c: Handle timecode from tmcd atom in counter mode
...
When the timecode value is in counter mode then it is important to use
the timescale and frameduration to calculate the timecode fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 13:14:15 +01:00
Michael Niedermayer
0982077be5
Merge commit '9108967513fcaff3d55514a7bca4c9fbba128c71'
...
* commit '9108967513fcaff3d55514a7bca4c9fbba128c71':
rtspdec: Consistently use rtsp_hd_out for writing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 12:26:47 +01:00
Martin Storsjö
9108967513
rtspdec: Consistently use rtsp_hd_out for writing
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-23 10:33:00 +02:00
Werner Robitza
4b46ce8e91
avformat: allow .264 as extension for raw H.264 stream
...
In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.
Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 23:13:08 +01:00
Michael Niedermayer
e32b07aea4
avformat/mov: Stricter sanity checks on the display_matrix
...
Fixes "broken" tkhd
Found-by: koda
Tested-by: koda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 19:52:52 +01:00
Michael Niedermayer
b942a71eaa
avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitles
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 13:26:29 +01:00
Michael Niedermayer
b7f8e6dd8c
Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'
...
* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
dashenc: Use inttypes.h macros for format strings instead of %lld
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 12:06:47 +01:00
Rodger Combs
89684883af
avformat/dashenc: fix format string generation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 11:55:21 +01:00
Martin Storsjö
3a724a7f3b
dashenc: Use inttypes.h macros for format strings instead of %lld
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-22 08:49:41 +02:00
Rodger Combs
1d8aa23794
dashenc: Fix format string generation
...
Previously this always used the "lld" format for all parameters,
not only time parameters.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-22 08:49:39 +02:00
Brian Brice
f845ae0c8e
librtmp: Allow changing the socket send buffer size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 22:24:28 +01:00
Christophe Gisquet
9a9b088d9e
libavformat/img2dec: fix warning when !HAVE_GLOB
...
Variables are unused in this case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 21:51:28 +01:00
Michael Niedermayer
ea3fc9fe68
smoothstreamingenc: Add a missing "goto fail"
...
This goto wasn't necessary originally, but it should have been
added when the write_manifest call was added in 8e276378
.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-19 22:31:08 +02:00
Mark Reid
b396914c68
libavformat/mxfdec.c: support demuxing opatom audio without index
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 22:02:58 +01:00
Michael Niedermayer
65b83ce01b
avformat/rmdec: Check the return value of av_get_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 20:55:49 +01:00
Michael Niedermayer
8d7ce5cdb7
avformat/nsvdec: Check the return value of av_get_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 20:53:25 +01:00
Clément Bœsch
14f3e8b821
avformat/sbgdec: remove double ;;
2015-01-18 00:36:56 +01:00
Michael Niedermayer
ab161bfa4b
avformat/asfdec: Check the av_get_packet() return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 20:40:21 +01:00
Michael Niedermayer
4adf75cade
avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 20:40:21 +01:00
Michael Niedermayer
edf1cb7aee
avformat/nsvdec: Check av_get_packet() return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 16:27:18 +01:00
Michael Niedermayer
2d0440f93f
Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'
...
* commit '3941df546276b190cc9362fd093e6721e8e52f50':
aea: Return proper error code on invalid header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 14:20:37 +01:00
Nidhi Makhijani
3941df5462
aea: Return proper error code on invalid header
2015-01-16 10:35:02 +01:00
Anshul Maheshwari
a47c9331ef
avformat: Improve data streams/codec support
...
This adds data codec/stream handling where previously there was only
audio/video/subtitles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 02:24:08 +01:00
Michael Niedermayer
b0be6d8385
avformat/id3v2: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 17:09:39 +01:00
Michael Niedermayer
6e69bf4a7e
Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
...
* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 14:45:29 +01:00
Michael Niedermayer
eb215be9ce
Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
...
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
id3v2: fix reading v2.2 attached pictures
Conflicts:
libavformat/id3v2.c
See: 05c3c568dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 13:01:40 +01:00
Michael Niedermayer
24c76bae5f
Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'
...
* commit '932788be5af8dee062c77851b573ea47dd6d047a':
id3v2: add names to the parameters of ID3v2EMFunc.read
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 12:53:53 +01:00
Michael Niedermayer
7eef45a76f
avformat/id3v2: Fix incompatible pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 12:46:13 +01:00
Michael Niedermayer
06ec2f1d32
Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'
...
* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
id3v2: constify the 'tag' parameter to special metadata parsing callback
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 12:45:20 +01:00
Martin Storsjö
024e5a2d5f
rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
...
This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.
The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.
The receiving code handles these packets correctly.
Pointed out by Cheolho Park.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-15 10:20:18 +02:00
Michael Niedermayer
cc18ea8de0
avformat/mov: Do not set aspect ratios that would contain zeros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 04:26:16 +01:00
Michael Niedermayer
47795505ac
avformat/mov: rewrite aspect from matrix code
...
The original code was intended purely for rotation == 0
In cf70ba37ba
the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 04:22:00 +01:00
Michael Niedermayer
89b6382bec
Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e'
...
* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e':
mov: Check angle rather than full matrix when updating SAR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 04:00:51 +01:00
Anton Khirnov
54bc15d5eb
id3v2: fix reading v2.2 attached pictures
...
In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.
2015-01-14 17:17:24 +01:00
Anton Khirnov
932788be5a
id3v2: add names to the parameters of ID3v2EMFunc.read
...
Some of them are not immediately obvious.
2015-01-14 17:17:24 +01:00
Anton Khirnov
8809c974a3
id3v2: constify the 'tag' parameter to special metadata parsing callback
...
Those functions should not ever modify it.
2015-01-14 17:17:24 +01:00
Vittorio Giovara
cf70ba37ba
mov: Check angle rather than full matrix when updating SAR
...
When the display matrix is not the identity one, but the rotation angle
is zero, there is no need to update the sample aspect ratio.
Otherwise, it is possible to obtain negative values which interferes
with transcoding in later stages. This kind of behaviour is reproducible
on mov files with "major_brand: MSNV".
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-01-14 17:17:23 +01:00
Vittorio Giovara
456ffec35d
img2dec: correctly use the parsed value from -start_number
...
Previously the image sequence was always starting from the minimum
number rather than the requested one.
CC: libav-stable@libav.org
2015-01-14 17:10:01 +01:00
Hendrik Leppkes
a9d700f212
mpegts: identify h264 mvc streams
...
This fixes missdetecting such streams as something else like AAC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 01:39:16 +01:00
Michael Niedermayer
f2e12f8942
avformat/smoothstreamingenc: Add missing "goto fail"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 00:17:52 +01:00
Michael Niedermayer
8d7d88135c
avformat/mpeg: Avoid dead assignment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 00:06:43 +01:00
Mark Reid
b23a866844
libavformat/mxfdec.c: export the full UMID as metadata
...
Previous version reviewed-by: tim nicholson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 01:16:39 +01:00
Mark Reid
b08b5f4be2
libavformat/mxfdec.c: read project_name metadata
...
MXF files generated by Media Composer or LibMXF can contain a
project name property in the Preface. Lots of existing samples have them.
http://samples.ffmpeg.org/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf
project_name : DNX145 PW Test
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3450/WriteAvidMXFgenerated/5502_0010_v1.mxf
project_name : Rombus
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3100/1sec_mxf_test_Video5270C795.mxf
project_name : NVB_DOOD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 20:26:58 +01:00
Carl Eugen Hoyos
a5334d4081
Handle r10k endianess atom DpxE.
...
Fixes playback and remuxing of r10k_full-range_big-endian.mov.
Reported, analyzed and tested by Olaf Matthes, olaf matthes gmx de
2015-01-11 12:15:03 +01:00
Michael Niedermayer
aa6545e1f3
avformat/hlsenc: more robust error tests
...
errors are negative throughout ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 05:17:44 +01:00
Michael Niedermayer
c8f83a4c78
avformat/voc: add seeking support
...
Fixes Ticket1333
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 00:35:01 +01:00
Michael Niedermayer
6f838dee3c
avformat/movenc: move variable to a more local block
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 04:50:50 +01:00
Michael Niedermayer
7824dc5150
avformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version 4.0.12.1"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 03:43:54 +01:00
wm4
aab74a38b8
rm: fix memory leak on init failure
...
AVInputFormat.read_close is not called if AVInputFormat.read_header
fails, so this needs to be handled separately.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 00:26:43 +01:00
Michael Niedermayer
f95cd5a235
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
...
* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
matroskaenc: refuse to write AAC without valid extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 21:25:49 +01:00
Michael Niedermayer
b1d223301f
avformat/hdsenc: Remove redundant NULL pointer checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 15:55:07 +01:00
Anton Khirnov
51da7d0274
matroskaenc: refuse to write AAC without valid extradata
2015-01-09 15:51:00 +01:00
Michael Niedermayer
ef3a6a48b5
avformat/tee: Simplify code by using avio_closep()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 13:40:09 +01:00
Michael Niedermayer
643dee846a
avformat/sapenc: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 13:39:48 +01:00
Michael Niedermayer
2959a61232
avformat/utils: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 13:39:06 +01:00
Peter Ross
6243845036
avformat/aiffdec: improve readability
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-09 00:50:45 +01:00
Carl Eugen Hoyos
cd3405282c
Skip Exif data when auto-detecting jpeg images.
2015-01-09 00:30:02 +01:00
Michael Niedermayer
d1d8f866b5
avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 20:19:20 +01:00
Michael Niedermayer
edeaf6f3a4
avformat/mlvdec: Simplify code by using avio_closep()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 20:19:20 +01:00
Michael Niedermayer
07e4ed5637
avformat/mov: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 20:19:20 +01:00
Michael Niedermayer
f9ddaa35c7
avformat/rtpenc_chain: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 20:19:20 +01:00
Michael Niedermayer
e360d030b3
avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 20:19:20 +01:00
Michael Niedermayer
bf3126db6a
avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:51:04 +01:00
Michael Niedermayer
26c72d2941
avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:50:34 +01:00
Michael Niedermayer
50bb9b87ab
avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:50:07 +01:00
Michael Niedermayer
b565fd4464
avformat/hdsenc: Simplify code by using avio_closep()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:13:36 +01:00
Michael Niedermayer
0e1bb03cb0
Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'
...
* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
mpeg: Remove unused field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 22:48:24 +01:00
Michael Niedermayer
e2404096b0
avformat/segment: Clear contexts after deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 22:29:16 +01:00
Michael Niedermayer
2a741baeff
Merge commit 'b3f04657368a32a9903406395f865e230b1de348'
...
* commit 'b3f04657368a32a9903406395f865e230b1de348':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 22:15:45 +01:00
Michael Niedermayer
dfffc4aadc
avformat/dvbsub: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 17:21:31 +01:00
Luca Barbato
01168bf140
mpeg: Remove unused field
2015-01-07 13:49:10 +01:00