ad7c5cba4e
lavf/rtpenc_jpeg: Do not check the table number when checking precision.
2015-07-09 20:00:31 +02:00
6253f511e0
Cosmetics: Reindent after last commit.
2015-07-09 19:52:06 +02:00
da46370e94
lavf/matroskaenc: Do not needlessly allocate memory for cuepoints.
...
Fixes ticket #4690 .
2015-07-09 19:49:37 +02:00
b457da4ce2
Merge commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e'
...
* commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e':
lavf/hevc: pad the RBSP buffer as required by the bistream reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 03:54:31 +02:00
4f5c2e651a
oggparsedirac: check return value of init_get_bits
...
If init_get_bits fails the GetBitContext is invalid and must not be
used. Check the return value in dirac_header and propogate the error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 03:46:37 +02:00
0054d5ac02
avformat/movenc: fix mime-types in movenc.c
...
https://developer.apple.com/library/ios/documentation/AppleApplications/Reference/SafariWebContent/CreatingContentforSafarioniPhone/CreatingContentforSafarioniPhone.html
says video/mp4
suggested by BBB on irc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 02:17:35 +02:00
17498b70d8
Merge commit '161a301d44274645c2272855dac3e4664f935603'
...
* commit '161a301d44274645c2272855dac3e4664f935603':
mpjpeg: Write the Content-length
Conflicts:
libavformat/mpjpeg.c
See: 0d2f4eedc8
2015-07-09 00:11:32 +02:00
2a33dc2cdf
Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212'
...
* commit 'd09b4cce21cdad5ef2855698395ffd6e37445212':
mpjpeg: Simplify using avio_printf
Conflicts:
libavformat/mpjpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-08 23:53:08 +02:00
0e7c0ec344
lavf/hevc: pad the RBSP buffer as required by the bistream reader
2015-07-08 23:36:10 +02:00
656e9a68c4
avformat/swfdec: Fix "}else" style
...
Found-by: durandal_170
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-08 12:06:17 +02:00
6a1204a1a4
avformat/swfdec: Do not error out on pixel format changes
...
Instead print an error and continue
Fixes Ticket4702
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-08 02:43:02 +02:00
1d5edad8cc
lavf/mpegtsenc: Only fail aac muxing if the first frame is invalid.
...
Fixes ticket #3957 .
2015-07-07 10:44:46 +02:00
161a301d44
mpjpeg: Write the Content-length
2015-07-04 00:51:03 +02:00
d09b4cce21
mpjpeg: Simplify using avio_printf
2015-07-04 00:46:44 +02:00
f046c3b5ac
lavc: Move deprecation warning disabling to files including the table
...
Unbreak build from 7a5902c556
2015-07-03 21:02:50 +02:00
5233f2534c
avformat/yuv4mpegenc: use avio_printf()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-03 18:43:21 +00:00
3b03186d56
Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'
...
* commit 'f046c3b5ac36848cce824b008e0347c621523041':
lavc: Move deprecation warning disabling to files including the table
lavc: Disable deprectation warnings coming from options table
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 21:40:47 +02:00
30ffbeb04a
Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'
...
* commit '016cac75c6061a1c03f812ddf258b8baefe70b00':
asfdec: prevent the infinite loop in detect unknown_subobject
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 03:58:33 +02:00
7755a57440
Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'
...
* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856':
asfdec: prevent possible memory leak in the asf_read_metadata_obj
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 03:51:00 +02:00
016cac75c6
asfdec: prevent the infinite loop in detect unknown_subobject
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-03 01:50:09 +02:00
9752d2e6cc
asfdec: prevent possible memory leak in the asf_read_metadata_obj
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-03 01:50:09 +02:00
1f69b7baa1
avformat/asfdec_f: Fix memleak
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 09:42:33 +02:00
72cad80016
avformat/asfdec_f: Add ASFDataType, use named types for metadata
...
This is based on asfdec_o.c, but uses a proper type instead of defines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 04:58:27 +02:00
59fffefdb4
avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 04:58:23 +02:00
c8eca438a9
avformat/asfdec_f: factor error checking out of main header parsing loop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 04:58:18 +02:00
838c5f3df7
avformat/utils: Redesign scoring in av_find_default_stream_index()
...
This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...
Fixes Ticket2687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 22:51:48 +02:00
5165c600eb
avformat/rtmpproto: increase hardcoded url/path lengths
...
Fixes #4103 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-01 20:03:26 +00:00
811008b8ee
avformat/asfdec_f: Assert that packet positions match in asf_read_pts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:59 +02:00
28206b75e8
avformat/asfdec_f: Correct skip to key code
...
Fixes Ticket3978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:54 +02:00
db64af6395
avformat/concatdec: copy stream metadata when using concat
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:43:31 +02:00
60ec3007e6
avformat/nutdec: Check ff_gen_search() for failure
...
Fixes assertion failure
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:28:41 +02:00
2f8c81637c
avformat/matroskadec: Fix undefined shift in read_sint()
...
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 12:00:43 +02:00
55a04a5d7a
Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
...
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
mov: Log format rather than fourcc in stsd in trace mode
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:15:27 +02:00
35c8dda5c2
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
...
* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
mov: Adjust variable types to fix format warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:06:42 +02:00
a8e137a322
Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'
...
* commit 'df22e30172b09cda4d6f7d4f43508284be65848a':
dump: Use the correct abs() version
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:51:56 +02:00
a1e2caa93e
mov: Log format rather than fourcc in stsd in trace mode
...
This will fix remaining format warnings.
2015-07-01 00:13:58 +01:00
2eef75fd7e
mov: Adjust variable types to fix format warnings
2015-07-01 00:13:58 +01:00
df22e30172
dump: Use the correct abs() version
...
Fix warning from clang "absolute value function 'abs' given an argument
of type 'long long' but has parameter of type 'int' which may cause
truncation of value [-Wabsolute-value]".
2015-07-01 00:13:58 +01:00
cfcb9f5e36
Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'
...
* commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a':
mov: Preserve the metadata even when bit-exactness is requested
Conflicts:
libavformat/movenc.c
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-mpeg4
See: a17ee4117d
2015-06-30 21:47:58 +02:00
e95c7a6185
mov: Preserve the metadata even when bit-exactness is requested
...
Make sure to not write the custom `encoder` string in that case.
Bug-Id: 845
CC: libav-stable@libav.org
2015-06-30 15:34:38 +02:00
42bc768e52
mpegts: Add jpeg2000 stream type
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-06-30 10:08:16 +02:00
088b410ea2
Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'
...
* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
mpegts: Add jpeg2000 stream type
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 13:08:26 +02:00
6d9dfb1267
Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'
...
* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
riff: Validate the wav header size before trying to parse it
Conflicts:
libavformat/riffdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:59:16 +02:00
3cd6b6aa0f
Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'
...
* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:48:11 +02:00
0d5a27c2b5
Rename asfdec-o.c to asfdec_o.c
...
Most files use _ instead of - as spacer, so this is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:23:44 +02:00
8f9c39b3e8
avformat: rename asfdec.c to asfdec_f.c
...
leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 12:23:12 +02:00
e55e5be982
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
lavf/img2dec: Improve detection of valid Quickdraw images.
lavf/asfdec: Reduce minimum header size.
Changelog: Add jpeg 2000 improvements before they get forgotten.
lavf/img2dec: Autodetect dds frames.
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-29 17:29:13 +02:00
da8b228977
avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace
...
This was suggested in the discussion about these functions
With this change the functions are available internally but are not
part of the public API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-29 16:30:43 +02:00
4b920d7b4a
lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
...
Reduces console spamming on debug level.
2015-06-29 16:29:07 +02:00
77c0b149be
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
...
Reduces console spamming on debug level.
2015-06-29 16:27:36 +02:00
Carl Eugen Hoyos
Michael Niedermayer
Chris Watkins
compn
Anton Khirnov
Frank Heckenbach
Luca Barbato
Vittorio Giovara
Paul B Mahol
Alexandra Hájková
John Adlum
Vadim Belov
John Högberg