9a8f1e7295
img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:25 +00:00
1d5b4f9fe9
img2dec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:25 +00:00
d343848de2
rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:24 +00:00
9f5bb44021
rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:24 +00:00
4c76600a8c
rawdec: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:24 +00:00
3d9a789b0d
bintext: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:24 +00:00
33b6d215fa
bintext: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 15:42:24 +00:00
8c43fd8654
tty: make use of AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 14:30:56 +00:00
20343219d2
tty: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-05 14:24:40 +00:00
8e85b69d71
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
...
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-05 12:39:06 +02:00
8df46c65cf
rtpdec: Increase max rtp packet size to 8192
...
Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-05 01:48:55 +02:00
5ed9eebc24
rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-05 01:48:55 +02:00
5e46f6b5b7
img2: Add j2k file extension for JPEG 2000
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-04-04 19:47:05 +02:00
3b93bea9e3
matroskadec: Check EBML lace sizes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 15:51:04 +02:00
115c3bc41f
matroskadec: Check for overflows in xiph lace decoding
...
This also detects errors earlier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 15:17:57 +02:00
14de77d677
matroskadec: fix return code for too long xiph laces
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 15:13:53 +02:00
7ad359b394
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
xmv: do not leak memory in the error paths in xmv_read_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 14:35:40 +02:00
208be6b54a
Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'
...
* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
xmv: check audio track parameters validity.
bmv: check for len being valid in bmv_decode_frame().
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 14:20:51 +02:00
cdafcf838c
Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'
...
* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
id3v2: pad the APIC packets as required by lavc.
dfa: check for invalid access in decode_wdlt().
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 13:41:01 +02:00
ab2989378f
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
...
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
lavf: make sure stream probe data gets freed.
avfiltergraph: set deprecated filter_count.
Conflicts:
libavformat/utils.c
See: 44a7a6300dmichaelni@gmx.at >
2013-04-04 13:24:33 +02:00
e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 13:00:59 +02:00
534b292102
Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'
...
* commit '8a96df7b70be509dae9ceec82d2c10a20361356d':
matroska: fix a corner case in ebml-lace parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 12:46:47 +02:00
f8080bd13b
xmv: do not leak memory in the error paths in xmv_read_header()
...
CC: libav-stable@libav.org
2013-04-04 07:54:45 +02:00
d1016dccdc
xmv: check audio track parameters validity.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-04-04 07:54:35 +02:00
8d617b11cf
id3v2: pad the APIC packets as required by lavc.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-04-04 07:54:15 +02:00
dbb1425811
lavf: make sure stream probe data gets freed.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-04-04 07:54:00 +02:00
e278500181
oggdec: Support byte based seeking
...
Fixed Ticket2317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 04:04:24 +02:00
e10f5bd05c
avformat: Add a mechanism to allow demuxers to detect byte based seeking.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 04:04:24 +02:00
f51ce34e5e
matroskadec: fix display_width/height = 0 handling
...
Fixes Ticket2424
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-03 23:45:32 +02:00
db2d3a9082
Skip padding in an id3 tag in aiff files.
...
Fixes ticket #2430 .
Reviewed-by: Matthieu Bouron
2013-04-03 15:45:46 +02:00
e3cc92a623
smacker: fix off by one error
...
Regression since a93b572ae4Fixes #2426 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-03 13:01:38 +00:00
25a80a931a
matroska: pass the lace size to the matroska_parse_rm_audio
...
Each lace must be independent according to the specification.
Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.
Stricter check than fc43c19a56libav-stable@libav.org
2013-04-03 12:34:38 +02:00
8a96df7b70
matroska: fix a corner case in ebml-lace parsing
...
Make sure we notice when the lace_size[n] is a negative value.
CC: libav-stable@libav.org
2013-04-03 12:33:15 +02:00
fc43c19a56
matroska: Update the available size after lace parsing
...
Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-04-03 12:33:01 +02:00
83e2217221
flvdec: fix seeking in audio only files
...
Fixes Seeking with the file in Ticket2283
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-03 03:57:37 +02:00
ccc25378bd
avformat: fix atomatic format selection for (s)segment
...
Fixes Ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-02 21:52:40 +02:00
24f822c3ab
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
oma: Validate sample rates
Conflicts:
libavformat/oma.c
See: a30165c4a8michaelni@gmx.at >
2013-04-01 12:48:04 +02:00
0933fd1533
oma: Validate sample rates
...
The sample rate index is 3 bits even if currently index 5, 6 and 7 are
not supported.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-03-31 16:10:52 +02:00
8cd7aab1bb
Use PIX_FMT_BGR24 for the AviSynth demuxer, instead of RGB24.
...
Partial fix for ticket #2412 in that using PIX_FMT_BGR24 fixes the
swapped channels issue when using scripts serving RGB24.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-31 01:09:33 +01:00
b448c0a68d
Write broken aac frames to mov files instead of skipping them.
...
Fixes decoding with picky media players.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-30 14:29:15 +01:00
4d3c5d3b65
Do not show "Estimating duration from bitrate" warning if no duration was estimated.
2013-03-30 08:24:51 +01:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 17:40:28 +01:00
774a268497
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
flvdec: read audio sample size and channels metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 11:02:25 +01:00
8ed9d34aa7
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'
...
* commit 'c3d015775388882b8a122afc337ea35108f652be':
flvdec: use the correct audio codec id when parsing metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 10:56:36 +01:00
24cfe91a22
id3v2: allocate large enough buffer
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 05:01:38 +01:00
551f683861
yop: Do not keep a copy of parts of the returned packet
...
Fixes double free
Regression since the new buffer references, thus no FFmpeg
releases should be affected
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 02:11:34 +01:00
27b7bfc7b5
avidec: Fix demuxing of non seekable avis with multiple RIFFs
...
This solution uses the size of the first RIFF if its valid
to check frame size validity when the filesize could not be determined.
Feedback is welcome, other ideas and improvments as well!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-28 17:30:42 +01:00
fd37a7dc3c
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
...
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
AVOptions: make av_set_options_string() forward options to child objects
win32: Use 64-bit fstat/lseek variants for MSVC as well
win32: Make ff_win32_open more robust
Conflicts:
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-28 12:26:36 +01:00
e46a2a7309
flvdec: read audio sample size and channels metadata
...
This is needed in order for the FLV demuxer not to detect a codec change when
using the "flv_metadata" option.
2013-03-28 06:27:28 -04:00
c3d0157753
flvdec: use the correct audio codec id when parsing metadata
2013-03-28 06:27:28 -04:00
Paul B Mahol