73ef12757b
append_packet_chunked: remove outcommented code
...
our variant works fine and should be better
also remove related unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:54:01 +01:00
523c8e0503
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
...
* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385':
iff: validate CMAP palette size
asfenc: return error on negative timestamp
Conflicts:
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:30:53 +01:00
50c449ac24
iff: validate CMAP palette size
...
Fixes CVE-2013-2495
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2013-03-18 10:48:29 +01:00
d1bec33b46
asfenc: return error on negative timestamp
...
According to the specification the timestamp is represented by a 32bit
unsigned.
CC: libav-stable@libav.org
2013-03-18 10:48:23 +01:00
519ebb5ee5
rmdec: flush audio packet on seeking
...
Fixes Ticket1605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 00:08:59 +01:00
9cde9f70ab
mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs.
...
The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV.
The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 16:24:34 +01:00
3313b9cc2d
lavc: remove unecessary a64enc include.
2013-03-17 04:38:28 +01:00
07d4f557e5
append_packet_chunked: Remove unused initialization.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 17:03:41 +01:00
e066fb54cb
Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
...
* commit 'aa3c77998404cc32233cb76e961ca27db8565459':
lavf: sanity check size in av_get/append_packet().
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 15:38:13 +01:00
aef816f957
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
...
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 14:10:09 +01:00
e4e4add0e3
Add raw VC-1 muxer to match demuxer.
...
This is admittedly kind of pointless since usually -f image2pipe
can be used for the purpose, but this is more user-friendly.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-16 13:42:53 +01:00
5301aed9ae
vc1testenc: give muxer same name as demuxer
...
Otherwise ffmpeg -formats claims that we only support demuxing
of that format.
To keep compatibility the struct could be duplicated instead,
but this seems almost like overkill for such a rare format.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-16 13:42:16 +01:00
c3c3bc7ff6
Make ff_win32_open more robust.
...
- Make MultiByteToWideChar fail when it encounters invalid encoding.
Without this, invalid characters might just be skipped
- When MultiByteToWideChar fails, assume the file name is in CP_ACP
and open it via normal open function, even when the file will be
written
- When malloc fails return error instead of crashing
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-16 13:40:36 +01:00
aa3c779984
lavf: sanity check size in av_get/append_packet().
...
To avoid allocating ridiculous amounts of memory for corrupted files,
read the input in chunks limited to filesize or an arbitrary large
amount when that is not known (chosen to be 50M).
2013-03-15 20:05:04 +01:00
a9b424879f
lavc & lavf: replace deprecated av_log* functions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-15 18:10:28 +00:00
70c0ae915d
matroskadec: avoid integer overflow
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 13:48:04 +01:00
2265bb93ff
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
add support for Monkey's Audio versions from 3.93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 13:43:01 +01:00
231795270b
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
...
* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
ape: make version-dependent decoding functions called via pointers
mpegts: add support for stream_type 0x42, which is CAVS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 13:28:38 +01:00
8425d693ee
flacdec: simplify bounds checking in flac_probe()
...
Simplify `p->buf > p->buf + p->buf_size - 4' as `p->buf_size < 4'.
Avoid a possible out-of-bounds pointer, which is undefined behavior
in C.
CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-03-15 12:51:57 +01:00
c42e262513
add support for Monkey's Audio versions from 3.93
2013-03-15 09:50:42 +01:00
81cf53e133
mpegts: add support for stream_type 0x42, which is CAVS
...
This allows demuxing and muxing of CAVS TS streams.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-15 09:33:24 +01:00
1f68bac50b
lavf/avio: fix two extreemly unreasonble typos.
2013-03-14 23:36:30 +01:00
13795dbb64
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
...
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:52:12 +01:00
a9ddb62489
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
...
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:41:34 +01:00
fa92ee821b
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
...
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:30:19 +01:00
1ae07959ab
rsodec: Use avpriv_report_missing_feature() where appropriate
2013-03-13 21:20:12 +01:00
1ecdf8912b
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
2013-03-13 20:42:21 +01:00
63d744e2be
av_log_missing_feature() ---> avpriv_report_missing_feature()
2013-03-13 20:42:21 +01:00
849f015406
Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
...
* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
Add informative messages to av_log_ask_for_sample calls lacking them
anm: Get rid of some very silly goto statements
Conflicts:
libavformat/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:03:22 +01:00
b2e0c9dd34
Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'
...
* commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530':
lavf: remove disabled FF_API_R_FRAME_RATE cruft
Conflicts:
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/rawdec.c
libavformat/utils.c
libavformat/version.h
The field is in use and no semantically equivalent field is available,
thus not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:55:00 +01:00
acbd14bc7e
avformat: postpone API removials where the functions are trivial wrapers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:43:02 +01:00
06a8350599
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
...
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:37:03 +01:00
256e1f7bdf
Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'
...
* commit '435c2a31ad5eead20eda1152097f60c3bfa22847':
lavf: remove disabled FF_API_READ_PACKET cruft
Conflicts:
libavformat/version.h
Removial postponed as wraper is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:34:06 +01:00
1c60956c80
Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
...
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
Conflicts:
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:21:43 +01:00
ed80427e0e
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'
...
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
Conflicts:
libavformat/version.h
removial postponed as the wraper code is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:18:06 +01:00
713ac21097
avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 20:06:31 +01:00
37cb3b180a
matroskadec: request a read buffer for the wav header
...
Solve an infiniloop.
CC: libav-stable@libav.org
2013-03-12 18:58:06 +01:00
b52421940f
lavf: add AV_ to two remaining CODEC_ID_*.
2013-03-12 16:21:22 +01:00
b36095ea0f
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
...
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:57:28 +01:00
0cfbfaaa12
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
...
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
a75f01d7e0
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
...
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:35:39 +01:00
c292e340ed
avformat: keep r_frame_rate
...
This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:28:23 +01:00
9cf788eca8
avformat/avdevice: add missing time.h includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:28:22 +01:00
a4472ac01e
Add informative messages to av_log_ask_for_sample calls lacking them
2013-03-12 11:09:45 +01:00
8f10f1a6dc
anm: Get rid of some very silly goto statements
2013-03-12 11:05:28 +01:00
85a5bc054c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
7b486ab13b
lavf: remove disabled FF_API_AV_GETTIME cruft
2013-03-11 18:23:18 +01:00
32e5194969
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
2013-03-11 18:23:10 +01:00
435c2a31ad
lavf: remove disabled FF_API_READ_PACKET cruft
2013-03-11 18:23:02 +01:00
c7e044c61b
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
2013-03-11 18:22:54 +01:00
Michael Niedermayer
Kostya Shishkov
Luca Barbato
Richard
Clément Bœsch
Reimar Döffinger
Anton Khirnov
Paul B Mahol
Xi Wang
Can Wu
Diego Biurrun
Hendrik Leppkes
Nicolas George