Michael Niedermayer
9d73e30253
ff_gen_search: make step 64it to prevent hypothetical integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Timothy Gu
e358044922
doc/decoders: Document libcelt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Matthew Heaney
59b13750d2
Add maintainer for WebVTT demuxer and muxer
...
Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9626d0e906
avutil/frame: Try to align width to achive linesize[0] alignment
...
This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier
Works around Issue described in Ticket1031
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e41bf19d2c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ca2818b881
swresample/x86/audio_convert: add emms to CONV
...
Might fix Ticket1874
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Janne Grunau
2ee380aefb
vaapi: return early from ff_vaapi_render_picture() without picture
...
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461 .
Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
12 years ago
Carl Eugen Hoyos
28bf0d94aa
Revert "vaapi: return early from ff_vaapi_render_picture() without picture"
...
This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.
I messed up the author information.
12 years ago
Carl Eugen Hoyos
3cbf245f2a
vaapi: return early from ff_vaapi_render_picture() without picture
...
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461 .
Tested-by: Timo
Reviewed-by: Joakim Plate
12 years ago
Alexander Strasser
ac604e446b
lavfi/src_movie: Use movie_common_init instead individual wrappers
...
Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
12 years ago
Alexander Strasser
c679a1c358
lavfi/src_movie: Check pointer is not NULL before deref
...
Also do not check against empty string, the lower levels should
be able to deal with it.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
12 years ago
Matthew Heaney
b24f15c45e
lavf: add WebVTT muxer.
...
This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:
http://dev.w3.org/html5/webvtt/
12 years ago
Michael Niedermayer
b4579a29c7
mmsh: dont close context on seeking failure
...
Fixes Ticket2581
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c7755c348b
mmsh/mmsh_close: use ffurl_closep()
...
avoid using freed pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
0329345da2
mmsh/mmsh_close: use av_freep()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
582f53349e
jpeg2000dec: make cblk->length(inc)/data use consistent
...
Fixes Ticket2612
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
de12b454f2
lavf/http: remove Mozilla/5.0 from user agent.
...
It is notably known to break playback on http streaming servers who use
the user agent to guess if it's a browser (to display a summary) or a
player (to stream the audio data).
This reverts 1fabd95
.
Fixes Ticket #2663 .
12 years ago
Vittorio Giovara
cd0faeee62
lavfi: math typo in interlace filter
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Marton Balint
96b33ddbd0
ffplay: remove remains of the old audio and video clock VideoState variables
...
The unified clock state holds this information now.
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Marton Balint
05f0d53170
ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles
...
Fixes regression with subtitles introduced in f2175a6
.
Fixes ticket #2666 .
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Marton Balint
f73d6d2af7
ffplay: cast vp->height to int64 in buffer size check
...
Fixes Coverity CID 1026769 and 1026756.
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
Michael Niedermayer
95275551ef
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
smacker: check frame size validity
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e99f324c14
Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'
...
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
smacker: pad the extradata allocation
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6c655b40ea
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
...
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
smacker: check the return value of smacker_decode_tree
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
85a3d20da5
Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'
...
* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a4a2e894fc
Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
...
* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
utils: fix avcodec_flush_buffers pre-reference counting compatibility
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1f87cbe834
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
...
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
avf: move url utility functions in a separate file
Conflicts:
libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8097307bfb
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
...
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
avf: move ff_write_chained to mux.c
Conflicts:
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
bbdef61850
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
...
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
84f77f8423
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
...
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4a522eff00
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
...
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
301522f521
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
...
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9265bae356
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
...
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
bitstream: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9f91e7deec
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
...
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
0a5d22a195
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
...
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
h264_mp4toannexb_bsf: factor out extradata parsing
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
46a5003a4a
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
...
* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
h264_mp4toannexb_bsf: K&R formatting cosmetics
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
e997afdfc6
lavf: show APIC for tta files too
...
Fixes #2676 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
9ea7ff7955
tta: read ape tags last
...
Otherwise, cover art will create video stream with index 0.
Fixes #2677 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
78d2d1e027
postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"
...
Fixes Ticket2675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Kostya Shishkov
ee16a0ced0
smacker: check frame size validity
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Kostya Shishkov
58c95448e4
smacker: pad the extradata allocation
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Kostya Shishkov
bbb2945f2d
smacker: check the return value of smacker_decode_tree
...
Also prevent a memory leak.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Kostya Shishkov
f52edef301
smacker: fix an off by one in huff.length computation
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Michael Niedermayer
3b86174290
avcodec/jpeg2000dec: move bpno check to a earlier place
...
This prevents additional integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Janne Grunau
985f34b756
utils: fix avcodec_flush_buffers pre-reference counting compatibility
...
The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.
(This regression caused use-after-free in VLC with hwaccel.)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Luca Barbato
df9f22d42b
avf: move url utility functions in a separate file
12 years ago
Luca Barbato
12db891dcd
avf: move ff_write_chained to mux.c
12 years ago
Luca Barbato
508998f7d5
avf: move riff tags accessors where they belong
12 years ago
Luca Barbato
ec7c51c786
avf: move ff_http_match_no_proxy to network
...
It is only used by network protocols.
12 years ago
Luca Barbato
afc8685395
avf: split off format register and lookup function
12 years ago