0163ad66e1
mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:48:52 +01:00
330e440706
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
print_options: do not generate docs for options without enc or dec flags
mpeg12: do not fail on zero dimensions in the sequence header.
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:43:43 +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
358628074c
print_options: do not generate docs for options without enc or dec flags
...
Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.
2013-03-18 15:36:25 +01:00
ce0124acac
mpeg12: do not fail on zero dimensions in the sequence header.
...
The total frame size is a combination of the 12 bits in the sequence
header and 2 more bits in the the sequence extension. While the
specification explicitly forbids the dimensions from the sequence header
from being 0 (thus ruling out multiples of 4096), such videos
apparrently exist in the wild so we should attempt to decode them.
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
Fixes Bug 416.
2013-03-18 15:36:10 +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
6abb554fd6
lavc,lavu: fix two doxy mixup between h/v chroma shift.
2013-03-18 09:04:11 +01:00
c10b57973d
lavfi/pad: fix horizontal/vertical shift confusion.
2013-03-18 08:51:55 +01:00
fbd3ee91a5
avutil/frame: typo
...
found by ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 04:47:27 +01:00
3dc25c3ab2
avutil/frame: document alignment and padding requirements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 04:13:21 +01:00
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +01:00
29e0357a11
aasc: fix pointer vs value error
...
Fixes Ticket2365
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 02:10:10 +01:00
8152451b56
buffersrc: fix w/h error
...
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 02:00:57 +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
ef3c88838e
doc/developer: Add "security fixes" to the release process steps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 22:53:28 +01:00
36258f9829
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
fate: add a test for -filter_complex / -lavfi without input.
ffmpeg: make -lavfi an alias for -filter_complex.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 21:55:27 +01:00
c603f22683
avutil/get_pool: remove dead operations whichs result is never used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 18:40:15 +01:00
e3be7b1159
avutil/get_pool: Remove redundant initial atomic operation
...
602->442 dezicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 18:40:15 +01:00
ec7fc7b7d1
fate: add a test for -filter_complex / -lavfi without input.
2013-03-17 16:24:43 +01:00
40ea006b76
ffmpeg: make -lavfi an alias for -filter_complex.
2013-03-17 16:24:43 +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
975fbd43ad
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/buffersink: fix header.
lavfi/buffersrc: disable deprecated warnings.
lavfi/buffersrc: check channel count changes.
lavfi/buffersrc: set channel layout if it is known.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 14:30:33 +01:00
fa7031ad37
h264_refs: fix typo in refs fallback check
...
Fixes regression since 01a0283
2013-03-17 14:21:46 +01:00
5787a71637
lavfi/swapuv: remove deprecated base field use
2013-03-17 13:06:01 +01:00
5fe542d7e1
ffplay: remove options skiploop, skipidct, skipframe
...
The corresponding codec options (skip_loop, skip_idct, skip_frame) can be
set in a more flexible way.
This technically causes a user interface break, but since the options
were not even documented and we just released a major version that should
not be a serious issue.
2013-03-17 13:05:44 +01:00
f7d1a18c90
ffplay: remove unused variable "codec"
...
Fix warning:
ffplay.c: In function ‘video_thread’:
ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]
2013-03-17 13:05:44 +01:00
171bd38eda
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:59:04 +01:00
ac1cea55ad
Merge commit '23f4c5acc438366d84cacf49e33b0bcd72f04937'
...
* commit '23f4c5acc438366d84cacf49e33b0bcd72f04937':
document the release process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:58:44 +01:00
7e6c67dd24
lavfi/buffersink: fix header.
...
Move non-obsolete functions, structures and constants outside
the scope of "#if FF_API_AVFILTERBUFFER".
Add attribute_deprecated to av_buffersink_get_buffer_ref()
and av_buffersink_poll_frame().
Add doxygen for av_buffersink_get_frame_flags().
2013-03-17 12:31:25 +01:00
a5149607df
lavfi/buffersrc: disable deprecated warnings.
2013-03-17 12:31:24 +01:00
f29c28a884
lavfi/buffersrc: check channel count changes.
2013-03-17 12:31:24 +01:00
79b1835726
sndio_dec: add missing #include for av_gettime()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-17 11:10:26 +00:00
3cd342636f
lavfi/buffersrc: set channel layout if it is known.
...
Introduced in 01649c7
2013-03-17 11:59:51 +01:00
6552808014
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
...
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
2013-03-17 09:10:04 +01:00
9f95e355be
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: add -af option
ffplay: use refcounted frames for audio
ffplay: use frame->pts if available for setting the audio clock
ffplay: restructure audio stream opening code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 05:24:41 +01:00
0f95534669
h264_qpel: fix another forgotten int stride
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 05:20:35 +01:00
3313b9cc2d
lavc: remove unecessary a64enc include.
2013-03-17 04:38:28 +01:00
e96175ad7b
ffplay: add -af option
...
Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:43:36 +01:00
738487f8db
ffplay: use refcounted frames for audio
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
9eafdd518c
ffplay: use frame->pts if available for setting the audio clock
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
1822519d2a
ffplay: restructure audio stream opening code
...
Preparation for -af support.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:31:37 +01:00
286153ea48
lavfi/alphaextract: fix frame memleak.
2013-03-17 03:12:44 +01:00
f566ac48ce
avutil/frame: fix video buffer allocation
...
The padding was lost during porting from avcodec
Should fix out of array accesses
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 02:19:25 +01:00
be5c5c399b
tests/filter-metadata-scenedetect: update reference
...
Fix reference after f7ab23b0d0
2013-03-17 02:04:45 +01:00
72a1257b5b
tests/eval: fix reference after b2098d2417
...
+10l to me, I blame the aliens.
2013-03-17 02:04:45 +01:00
2b27f7fb04
lavfi/thumbnail: replace frame unref with free.
...
Fixes memleak spotted by FATE.
2013-03-17 01:46:22 +01:00
f7ab23b0d0
ffprobe: remove deprecated frame "reference" field
2013-03-17 00:27:48 +01:00
db36ea5b5e
lavfi/settb: add support for named options
2013-03-17 00:27:33 +01:00
0407a79e41
lavfi/blackframe: add support for named options
2013-03-17 00:27:08 +01:00
Michael Niedermayer
Anton Khirnov
Kostya Shishkov
Luca Barbato
Clément Bœsch
Nicolas George
Richard
Stefano Sabatini
Paul B Mahol
Marton Balint