OSDN Git Service
Michael Niedermayer [Fri, 21 Jun 2013 17:39:45 +0000 (19:39 +0200)]
h264: fix size of arrays in ff_h264_check_intra_pred_mode()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 17:51:30 +0000 (19:51 +0200)]
h264/ff_h264_check_intra_pred_mode: fix input value check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 21 Jun 2013 16:20:05 +0000 (18:20 +0200)]
doc/decoders,decoders: add various missing final dots
Enhance consistency.
Timothy Gu [Fri, 21 Jun 2013 16:17:21 +0000 (18:17 +0200)]
doc/decoders: Add libopencore-amrwb decoder doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 21 Jun 2013 15:40:54 +0000 (17:40 +0200)]
doc/protocols: apply very minor consistency fixes
Andrey Utkin [Wed, 19 Jun 2013 05:21:00 +0000 (08:21 +0300)]
doc/protocols: document "srtp" protocol
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Hendrik Leppkes [Sat, 15 Jun 2013 20:46:01 +0000 (22:46 +0200)]
mathops/x86: work around inline asm miscompilation with GCC 4.8.1
The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 21 Jun 2013 03:08:35 +0000 (20:08 -0700)]
doc/decoders: Document libopencore-amrnb decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 18:20:56 +0000 (20:20 +0200)]
avdevice/x11grab: allocate just one Cursor
Fixes resource leak and Ticket2450
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 08:49:42 +0000 (10:49 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: free the padded last frame during audio encoding properly
See:
7fff3df6b277d4f1ebc504e950c9de56cdc14ddd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 08:41:41 +0000 (10:41 +0200)]
Merge commit '
eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'
* commit '
eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
vsrc_movie: do not free avoption variables in uninit()
Conflicts:
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Thu, 20 Jun 2013 23:33:49 +0000 (16:33 -0700)]
doc/decoders: Document libilbc decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Jun 2013 01:22:02 +0000 (03:22 +0200)]
avcodec/utvideodec: Fix vlc len
Fixes regression / Ticket2661
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 22:32:00 +0000 (00:32 +0200)]
bytestream2_init: assert that buf_size is valid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 22:31:00 +0000 (00:31 +0200)]
avcodec/jpeg2000dec: check that tp_end is after the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Jun 2013 19:49:02 +0000 (21:49 +0200)]
avformat/iff: Byte seek is unsupported
Fixes Ticket2194
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 18 Jun 2013 09:41:04 +0000 (11:41 +0200)]
lavc: free the padded last frame during audio encoding properly
Michael Niedermayer [Tue, 18 Jun 2013 15:55:50 +0000 (17:55 +0200)]
avformat/libmodplug: Reduce the probe score for small input
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583
Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 19 Jun 2013 05:20:13 +0000 (08:20 +0300)]
Document "sctp" protocol
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 20 Jun 2013 11:27:14 +0000 (13:27 +0200)]
vsrc_movie: do not free avoption variables in uninit()
The generic code frees them as well. Since av_free was used to free them
instead of av_freep, this would result in a double free.
Michael Niedermayer [Thu, 20 Jun 2013 08:29:05 +0000 (10:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Remove unneeded icl inline compatibility definition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 19 Jun 2013 05:17:58 +0000 (08:17 +0300)]
Document "crypto" protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 23:01:43 +0000 (16:01 -0700)]
doc/decoders: Document libgsm decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 20:13:29 +0000 (22:13 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Autodetect idcin only if audio properties allow decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 19 Jun 2013 14:07:09 +0000 (16:07 +0200)]
delogo: Fix function description
The algorithm works on src and writes to dst, not the other way
around.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 19 Jun 2013 14:31:10 +0000 (16:31 +0200)]
Autodetect idcin only if audio properties allow decoding.
Fixes ticket #2688.
Compn [Wed, 19 Jun 2013 14:43:48 +0000 (10:43 -0400)]
isom: add xd51 hdcam , someone needs to binary search FCP for new isom...
Michael Niedermayer [Wed, 19 Jun 2013 08:06:38 +0000 (10:06 +0200)]
sonicenc: fix off by 1 error
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 08:06:10 +0000 (10:06 +0200)]
sonicenc: dont put multiple assignments per line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Smith [Wed, 19 Jun 2013 00:39:47 +0000 (20:39 -0400)]
configure: Remove unneeded icl inline compatibility definition
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 19 Jun 2013 07:50:01 +0000 (09:50 +0200)]
sonicenc: set supported samples formats array
This ensures that only supported formats are input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Jun 2013 06:27:35 +0000 (08:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
Conflicts:
libavfilter/audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 00:38:38 +0000 (17:38 -0700)]
doc/encoders: Add libopencore-amrnb doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 23:25:32 +0000 (01:25 +0200)]
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mark Visser [Tue, 18 Jun 2013 21:38:17 +0000 (17:38 -0400)]
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
Michael Niedermayer [Tue, 18 Jun 2013 18:50:15 +0000 (20:50 +0200)]
ff_gen_search: fix infinite loop
Fixes Ticket2639
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 18:48:53 +0000 (20:48 +0200)]
ff_gen_search: fix limit
The limit value could become slightly wrong in the last iteration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 18:47:07 +0000 (20:47 +0200)]
ff_gen_search: make step 64it to prevent hypothetical integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 18 Jun 2013 00:42:08 +0000 (17:42 -0700)]
doc/decoders: Document libcelt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Heaney [Mon, 17 Jun 2013 23:29:13 +0000 (16:29 -0700)]
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>
Michael Niedermayer [Tue, 18 Jun 2013 14:39:23 +0000 (16:39 +0200)]
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>
Anton Khirnov [Wed, 29 May 2013 19:03:20 +0000 (21:03 +0200)]
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
Michael Niedermayer [Tue, 18 Jun 2013 07:29:35 +0000 (09:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Jun 2013 00:09:46 +0000 (02:09 +0200)]
swresample/x86/audio_convert: add emms to CONV
Might fix Ticket1874
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 17 Jun 2013 23:56:06 +0000 (01:56 +0200)]
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>
Carl Eugen Hoyos [Mon, 17 Jun 2013 23:54:30 +0000 (01:54 +0200)]
Revert "vaapi: return early from ff_vaapi_render_picture() without picture"
This reverts commit
4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.
I messed up the author information.
Carl Eugen Hoyos [Mon, 17 Jun 2013 22:21:09 +0000 (00:21 +0200)]
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
Alexander Strasser [Sun, 16 Jun 2013 19:44:02 +0000 (21:44 +0200)]
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>
Alexander Strasser [Sun, 16 Jun 2013 18:31:08 +0000 (20:31 +0200)]
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>
Matthew Heaney [Wed, 12 Jun 2013 19:46:16 +0000 (12:46 -0700)]
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/
Michael Niedermayer [Mon, 17 Jun 2013 20:03:36 +0000 (22:03 +0200)]
mmsh: dont close context on seeking failure
Fixes Ticket2581
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Jun 2013 19:34:52 +0000 (21:34 +0200)]
mmsh/mmsh_close: use ffurl_closep()
avoid using freed pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Jun 2013 19:31:07 +0000 (21:31 +0200)]
mmsh/mmsh_close: use av_freep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 01:17:19 +0000 (03:17 +0200)]
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>
Clément Bœsch [Mon, 17 Jun 2013 15:03:15 +0000 (17:03 +0200)]
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.
Vittorio Giovara [Mon, 17 Jun 2013 09:54:26 +0000 (11:54 +0200)]
lavfi: math typo in interlace filter
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Marton Balint [Sat, 15 Jun 2013 16:40:44 +0000 (18:40 +0200)]
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>
Marton Balint [Sat, 15 Jun 2013 16:26:22 +0000 (18:26 +0200)]
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>
Marton Balint [Tue, 4 Jun 2013 21:23:09 +0000 (23:23 +0200)]
ffplay: cast vp->height to int64 in buffer size check
Fixes Coverity CID
1026769 and
1026756.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: check frame size validity
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:44:32 +0000 (00:44 +0200)]
Merge commit '
58c95448e42d34910b939363949ba1a92c06b0b0'
* commit '
58c95448e42d34910b939363949ba1a92c06b0b0':
smacker: pad the extradata allocation
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 22:27:48 +0000 (00:27 +0200)]
Merge commit '
f52edef30197735bfb937e9e723ab1e7b31165c6'
* commit '
f52edef30197735bfb937e9e723ab1e7b31165c6':
smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 22:05:02 +0000 (00:05 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)]
Merge commit '
508998f7d5cc61c7ac7b049813b47adc24c6e282'
* commit '
508998f7d5cc61c7ac7b049813b47adc24c6e282':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)]
Merge commit '
afc8685395e775fe0f2a1698b683aea4afd124af'
* commit '
afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)]
Merge commit '
f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
* commit '
f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)]
Merge commit '
f776899a17dce32ad7fb9231d98f15558f37cc3f'
* commit '
f776899a17dce32ad7fb9231d98f15558f37cc3f':
bitstream: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 20:59:59 +0000 (22:59 +0200)]
Merge commit '
9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
* commit '
9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)]
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>
Paul B Mahol [Sun, 16 Jun 2013 18:49:51 +0000 (18:49 +0000)]
lavf: show APIC for tta files too
Fixes #2676.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 16 Jun 2013 18:46:35 +0000 (18:46 +0000)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 16:19:30 +0000 (18:19 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:30:51 +0000 (14:30 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:28:07 +0000 (14:28 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:27:00 +0000 (14:27 +0200)]
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>
Kostya Shishkov [Wed, 12 Jun 2013 12:22:24 +0000 (14:22 +0200)]
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>
Michael Niedermayer [Sun, 16 Jun 2013 13:27:39 +0000 (15:27 +0200)]
avcodec/jpeg2000dec: move bpno check to a earlier place
This prevents additional integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sat, 15 Jun 2013 19:11:55 +0000 (22:11 +0300)]
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>
Luca Barbato [Sat, 15 Jun 2013 10:03:27 +0000 (12:03 +0200)]
avf: move url utility functions in a separate file
Luca Barbato [Sat, 15 Jun 2013 09:56:36 +0000 (11:56 +0200)]
avf: move ff_write_chained to mux.c
Luca Barbato [Sat, 15 Jun 2013 09:44:07 +0000 (11:44 +0200)]
avf: move riff tags accessors where they belong
Luca Barbato [Sat, 15 Jun 2013 09:41:36 +0000 (11:41 +0200)]
avf: move ff_http_match_no_proxy to network
It is only used by network protocols.
Luca Barbato [Sat, 15 Jun 2013 09:26:09 +0000 (11:26 +0200)]
avf: split off format register and lookup function
James Almer [Sun, 16 Jun 2013 00:29:08 +0000 (21:29 -0300)]
lavu/adler32: Fix doxy group definition, take two
The description if for the function, not the group.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 16 Jun 2013 00:29:07 +0000 (21:29 -0300)]
lavu/hash: Add support for RIPEMD
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 16 Jun 2013 07:46:17 +0000 (09:46 +0200)]
rawdec: allocate a buffer in the appropriate size in the copy case.
Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 15 Jun 2013 08:28:30 +0000 (10:28 +0200)]
bitstream: forward error values and drop few abort()
Luca Barbato [Sat, 15 Jun 2013 08:19:51 +0000 (10:19 +0200)]
bitstream: K&R formatting cosmetics
Michael Niedermayer [Sat, 15 Jun 2013 23:07:13 +0000 (01:07 +0200)]
Merge branch 'crypto' of https://github.com/jamrial/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 15 Jun 2013 17:04:19 +0000 (14:04 -0300)]
lavu: Add RIPEMD hashing
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 15 Jun 2013 17:03:37 +0000 (14:03 -0300)]
lavf/md5enc: Use AV_HASH_MAX_SIZE
Also increase the buffer size in write_trailer(), since 128
is not enough anymore
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 2 Jun 2013 20:48:49 +0000 (17:48 -0300)]
lavu/hash: Add support for SHA-2 512
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sat, 15 Jun 2013 20:55:27 +0000 (20:55 +0000)]
lavu/utils: silence warnings about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andrey Utkin [Sat, 15 Jun 2013 20:03:38 +0000 (23:03 +0300)]
Document "cache" protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 11 Jun 2013 15:57:31 +0000 (17:57 +0200)]
h264_mp4toannexb_bsf: return a padded buffer
The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.