OSDN Git Service
Christophe Gisquet [Sun, 25 Jan 2015 21:13:10 +0000 (18:13 -0300)]
x86/sbrdsp: Use different mem moves
Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips
After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 25 Jan 2015 21:06:28 +0000 (18:06 -0300)]
x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}
2 to 2.5 times faster.
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 25 Jan 2015 18:00:07 +0000 (19:00 +0100)]
avfilter/vf_mcdeint: Set no_bitstream=1
This avoids unneeded writing of the bitstream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 15:00:46 +0000 (16:00 +0100)]
avfilter/vf_mcdeint: fix gop_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 14:58:28 +0000 (15:58 +0100)]
avfilter/vf_uspp: fix gop_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 14:50:42 +0000 (15:50 +0100)]
avfilter/vf_uspp: Use FF_CEIL_RSHIFT() correct rounding of odd w/h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 13:32:22 +0000 (14:32 +0100)]
avformat/movenc: Check failure of allocation of ctts_entries and propagate error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 13:28:43 +0000 (14:28 +0100)]
avformat/movenc: fix cleanup on insufficient reserved_moov_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Jan 2015 13:16:31 +0000 (14:16 +0100)]
doc/APIchanges: fill in the remaining missing dates
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Jan 2015 21:51:25 +0000 (22:51 +0100)]
ffmpeg: allow overriding and amending AVStream->disposition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Jan 2015 23:26:53 +0000 (00:26 +0100)]
avformat/matroskadec: Use av_malloc_array() for index_entries
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Jan 2015 23:25:01 +0000 (00:25 +0100)]
avformat/matroskadec: Check av_mallocz() return values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 24 Jan 2015 20:52:58 +0000 (12:52 -0800)]
nvenc: Propagate desired number of reference frames.
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Jan 2015 17:44:40 +0000 (18:44 +0100)]
avdevice/dshow_crossbar: Avoid mixing declarations and statements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sat, 24 Jan 2015 14:26:15 +0000 (15:26 +0100)]
hevc: pass the full HEVCNAL struct to decode_nal_unit
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Jan 2015 19:56:07 +0000 (20:56 +0100)]
avutil/pixdesc: rewrite AV_PIX_FMT_FLAG_PSEUDOPAL documentation
It seems many people do not understand its current documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Jan 2015 12:18:15 +0000 (13:18 +0100)]
doc/APIchanges: Fill in remaining missing hashes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 20 Jan 2015 21:33:00 +0000 (22:33 +0100)]
ffmpeg_opt: expand format for strftime
While the shortened format specifiers are valid C99 ones, they are
not supported by e.g. some Visual Studio runtimes (and thus mingw).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:56:18 +0000 (01:56 -0300)]
ffserver: reflow find_stream_in_feed()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:44:23 +0000 (01:44 -0300)]
ffserver: reindent handle_connection()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:35:39 +0000 (01:35 -0300)]
ffserver: reflow handle_connection()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:11:58 +0000 (01:11 -0300)]
ffserver: reindent http_vlog()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:10:35 +0000 (01:10 -0300)]
ffserver: reflow http_vlog()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Jean First [Fri, 23 Jan 2015 20:58:41 +0000 (21:58 +0100)]
lavc/libopenjpegenc: move opj_setup_encoder to libopenjpeg_encode_frame
if the openjpeg parameter tcp_rates is not 0 ( using the ffmpeg compression_level option )
every 2nd image per thread is badly encoded. By moving the opj_setup_encoder function from
libopenjpeg_encode_init to libopenjpeg_encode_frame this can be prevented.
This fixes ticket #3754.
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 22:44:57 +0000 (23:44 +0100)]
Merge remote-tracking branch 'rdp/dshow_crossbar'
* rdp/dshow_crossbar:
dshow: fix docu escapes
dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name.
dshow: add options for allowing filter popup configuration dialogs to be presented to the user
dshow: introduce support for crossbar [multiple input selectable] devices
dshow: drop initial audio packets with weird timestamps
dshow: use non deprecated api
dshow: miscellaneous tweaks
dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 21:53:25 +0000 (22:53 +0100)]
Merge commit '
3a6dfec864d569c2d0a875e1a7466f51b00edb63'
* commit '
3a6dfec864d569c2d0a875e1a7466f51b00edb63':
segment: Check av_get_frame_filename() return value
Conflicts:
libavformat/segment.c
No changes as there was no unchecked av_get_frame_filename() in segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 21:27:42 +0000 (22:27 +0100)]
Merge commit '
7915e6741dbe1cf3a8781cead3e68a7666de14f4'
* commit '
7915e6741dbe1cf3a8781cead3e68a7666de14f4':
hlsproto: Properly close avio buffer in case of error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 21:19:21 +0000 (22:19 +0100)]
Merge commit '
4c5fa628da099dbb598c93bc4555b8733d2c3035'
* commit '
4c5fa628da099dbb598c93bc4555b8733d2c3035':
mov: Do not compute negative SAR values
Conflicts:
libavformat/mov.c
See:
e32b07aea4981719a3e6ce92491349c9547958e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 20:59:18 +0000 (21:59 +0100)]
Merge commit '
2a06c2a03e1205aaeede5af850b9271752ddd4cf'
* commit '
2a06c2a03e1205aaeede5af850b9271752ddd4cf':
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
Conflicts:
libavcodec/mpegvideo_enc.c
See:
1e78679768b3a1ef336c5b52aa5027d8a50fcf0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 17:15:43 +0000 (18:15 +0100)]
avformat/dv: check av_malloc() return code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 16:45:35 +0000 (17:45 +0100)]
avformat/librtmp: Fix build with --disable-network --enable-librtmp
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Fri, 23 Jan 2015 15:31:58 +0000 (08:31 -0700)]
dshow: fix docu escapes
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Vittorio Giovara [Thu, 22 Jan 2015 20:13:45 +0000 (20:13 +0000)]
segment: Check av_get_frame_filename() return value
CC: libav-stable@libav.org
Bug-Id: CID
1265713
Vittorio Giovara [Thu, 22 Jan 2015 20:13:44 +0000 (20:13 +0000)]
hlsproto: Properly close avio buffer in case of error
Fix a memory leak.
CC: libav-stable@libav.org
Bug-Id: CID 717999
Vittorio Giovara [Thu, 22 Jan 2015 19:10:27 +0000 (19:10 +0000)]
mov: Do not compute negative SAR values
This partially reverts
cf70ba37ba74089a18295b29e77dead0a3222c9e, since
it didn't take into account when rotation is 0, but there is another
valid operation (eg. translation) in the matrix.
Found-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 14:09:21 +0000 (15:09 +0100)]
doc/APIchanges: fill in more missing hash values and dates
all values before 2.5 seem to be filled in now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 14:03:40 +0000 (15:03 +0100)]
avfilter/af_channelmap: Check for missing argument in get_channel_idx()
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Fri, 23 Jan 2015 13:54:44 +0000 (06:54 -0700)]
dshow: some devices only list themselves under "Video sources" but
actually have both video and audio output pins, so make the audio pins
accessible by video source name.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Fri, 23 Jan 2015 13:49:37 +0000 (06:49 -0700)]
dshow: add options for allowing filter popup configuration dialogs to be presented to the user
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Fri, 23 Jan 2015 13:35:16 +0000 (06:35 -0700)]
dshow: introduce support for crossbar [multiple input selectable] devices
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Fri, 23 Jan 2015 13:13:33 +0000 (06:13 -0700)]
dshow: drop initial audio packets with weird timestamps
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Fri, 23 Jan 2015 13:07:24 +0000 (06:07 -0700)]
dshow: use non deprecated api
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Michael Niedermayer [Sat, 16 Feb 2013 09:44:38 +0000 (10:44 +0100)]
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
This improves motion estimation and avoids using uninitialized data
for resolutions that aren't a multiple of 16.
Prior to
d2a25c40, the edges used to be initialized so that encoding
was deterministic, but after that commit it started using uninitialized
data (for non multiple of 16 resolutions).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
rogerdpack [Fri, 23 Jan 2015 13:01:32 +0000 (06:01 -0700)]
dshow: miscellaneous tweaks
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Fri, 23 Jan 2015 12:34:30 +0000 (05:34 -0700)]
dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Jon Morley [Fri, 23 Jan 2015 07:04:24 +0000 (23:04 -0800)]
libavformat/mov.c: Handle timecode from tmcd atom in counter mode
When the timecode value is in counter mode then it is important to use
the timescale and frameduration to calculate the timecode fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Jan 2015 11:26:23 +0000 (12:26 +0100)]
Merge commit '
9108967513fcaff3d55514a7bca4c9fbba128c71'
* commit '
9108967513fcaff3d55514a7bca4c9fbba128c71':
rtspdec: Consistently use rtsp_hd_out for writing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 21 Jan 2015 13:23:50 +0000 (14:23 +0100)]
rtspdec: Consistently use rtsp_hd_out for writing
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 14 Jan 2015 23:40:35 +0000 (00:40 +0100)]
avutil/buffer: factor buffer_replace() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 19:30:53 +0000 (20:30 +0100)]
avcodec/h264: Partially decode and display single fields try #2
This like the previous attempt does not fully correctly decode this
type of non standard H.264, but it now works fully automatic
requiring no manual filters or flags to be used
See Ticket2254
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Werner Robitza [Thu, 22 Jan 2015 21:02:36 +0000 (22:02 +0100)]
avformat: allow .264 as extension for raw H.264 stream
In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.
Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 21:51:40 +0000 (22:51 +0100)]
Merge commit '
6341ab0ad3fde9583138e121f518e21cde15258e'
* commit '
6341ab0ad3fde9583138e121f518e21cde15258e':
libx265: Pass through user-set frame type
See:
41e983f1a63927dc0a2596cf2f0f7a946a048f11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 15:53:14 +0000 (16:53 +0100)]
avformat/mov: Stricter sanity checks on the display_matrix
Fixes "broken" tkhd
Found-by: koda
Tested-by: koda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Wed, 21 Jan 2015 15:16:18 +0000 (15:16 +0000)]
libx265: Pass through user-set frame type
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 21 Jan 2015 15:16:18 +0000 (15:16 +0000)]
libx265: Pass through user-set frame type
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Thu, 22 Jan 2015 12:56:30 +0000 (13:56 +0100)]
avfilter/avf_showcqt: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 12:54:26 +0000 (13:54 +0100)]
avfilter/drawutils: Check for av_malloc* failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 12:50:30 +0000 (13:50 +0100)]
avfilter/drawutils: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 22:55:09 +0000 (23:55 +0100)]
avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitles
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 12:09:21 +0000 (13:09 +0100)]
doc/APIchanges: Fill in some more missing hash values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 19 Jan 2015 22:38:10 +0000 (23:38 +0100)]
avcodec/mpegvideo: also export 0,0 motion vectors
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 11:06:34 +0000 (12:06 +0100)]
Merge commit '
3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'
* commit '
3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
dashenc: Use inttypes.h macros for format strings instead of %lld
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 22 Jan 2015 10:55:53 +0000 (11:55 +0100)]
Merge commit '
1d8aa23794cc63e9517d5055a2d48040b843b1cf'
* commit '
1d8aa23794cc63e9517d5055a2d48040b843b1cf':
dashenc: Fix format string generation
See:
89684883af44bfa04560ce0864d8633d915c2480
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Wed, 21 Jan 2015 15:36:53 +0000 (09:36 -0600)]
avformat/dashenc: fix format string generation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 21 Jan 2015 15:45:29 +0000 (16:45 +0100)]
dashenc: Use inttypes.h macros for format strings instead of %lld
Signed-off-by: Martin Storsjö <martin@martin.st>
Rodger Combs [Wed, 21 Jan 2015 15:36:53 +0000 (09:36 -0600)]
dashenc: Fix format string generation
Previously this always used the "lld" format for all parameters,
not only time parameters.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:49:04 +0000 (01:49 +0100)]
lavc/pnm: Support decoding ya16.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:47:54 +0000 (01:47 +0100)]
lavc/pamenc: Support encoding ya16be.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:38:58 +0000 (01:38 +0100)]
lavc/tiffenc: Support encoding ya16le.
Carl Eugen Hoyos [Thu, 22 Jan 2015 00:33:05 +0000 (01:33 +0100)]
lavc/pngenc: Support encoding ya16be.
Brian Brice [Tue, 20 Jan 2015 03:01:00 +0000 (21:01 -0600)]
librtmp: Allow changing the socket send buffer size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 20 Jan 2015 21:03:18 +0000 (22:03 +0100)]
libavformat/img2dec: fix warning when !HAVE_GLOB
Variables are unused in this case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 20:30:48 +0000 (21:30 +0100)]
Merge commit '
da9bffaf08a1173451da1b4e1ae50881e7093642'
* commit '
da9bffaf08a1173451da1b4e1ae50881e7093642':
doc/platform: Reference only MSYS2 and MinGW-w64
Conflicts:
doc/platform.texi
See:
6c906ded380e9a11ff350c17f0e03271c8fb6154
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 19:23:45 +0000 (20:23 +0100)]
swscale/input: fix rgba64 alpha non native
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 19:14:34 +0000 (20:14 +0100)]
swscale/input: Fix alpha of YA16 input
Fixes Ticket4278
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Jan 2015 14:16:42 +0000 (15:16 +0100)]
avfilter/vf_showinfo: show timebase & framerate too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 20 Jan 2015 17:16:21 +0000 (17:16 +0000)]
avfilter/vf_lenscorrection: support 8bit planar RGB formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Mon, 19 Jan 2015 18:47:20 +0000 (18:47 +0000)]
doc/platform: Reference only MSYS2 and MinGW-w64
It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 19 Jan 2015 18:47:20 +0000 (18:47 +0000)]
doc/platform: Reference only MSYS2 and MinGW-w64
It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 21 Jan 2015 13:24:08 +0000 (14:24 +0100)]
doc/APIchanges: fill in and correct some values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 11:27:36 +0000 (12:27 +0100)]
doc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()
also add deprecation note for avcodec_get_pix_fmt_loss(), avcodec_find_best_pix_fmt_of_2()
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
agathah [Wed, 21 Jan 2015 05:53:29 +0000 (13:53 +0800)]
avcodec/nvenc: set repeatSPSPPS flag for streaming
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 21 Jan 2015 04:35:50 +0000 (05:35 +0100)]
ffprobe: fix memleaks on errors
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 20 Jan 2015 17:46:01 +0000 (18:46 +0100)]
libavcodec/ppc/mpegvideoencdsp.c: fix stack smashing in pix_norm1_altivec() and pix_sum_altivec()
The vec_ste calls were mistakenly changed to vec_vsx_st in
c5ca76a, which
caused stack smashing.
Changing them back fixes crashes on ppc64el, when configured with
--toolchain=hardened.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 20:29:19 +0000 (21:29 +0100)]
Merge commit '
440119b18836887d98c9e337c5911563bb43588c'
* commit '
440119b18836887d98c9e337c5911563bb43588c':
libopenh264enc: Move a declaration of a variable into an ifdef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 20:15:17 +0000 (21:15 +0100)]
Merge commit '
bba02479260d0e7dec8c530a7e75a1c7aa53c06e'
* commit '
bba02479260d0e7dec8c530a7e75a1c7aa53c06e':
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 20:09:16 +0000 (21:09 +0100)]
Merge commit '
ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c'
* commit '
ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c':
smoothstreamingenc: Add a missing "goto fail"
See:
f2e12f8942e5434df3d0f41851a1560fc4663dae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 20 Jan 2015 16:52:30 +0000 (16:52 +0000)]
avfilter/af_join: swap av_mallocz_array() args for consistency with the prototype
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 20 Jan 2015 16:41:18 +0000 (16:41 +0000)]
avfilter/af_join: Use av_mallocz_array()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 20 Jan 2015 15:26:42 +0000 (16:26 +0100)]
avfilter/af_ashowinfo: Use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 15:24:21 +0000 (16:24 +0100)]
avdevice/alsa-audio-common: Use *alloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 20 Jan 2015 15:48:43 +0000 (15:48 +0000)]
fix Makefile: remove ilpack
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 20 Jan 2015 15:36:31 +0000 (15:36 +0000)]
lavfi: remove mp=ilpack
Filter does not work, asserts here.
scale=interl=1,format=yuv422p should be used instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Wed, 7 Jan 2015 22:03:36 +0000 (00:03 +0200)]
libopenh264enc: Move a declaration of a variable into an ifdef
This avoids needing an attribute for silencing warnings about
it being unused.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 8 Jan 2015 11:50:58 +0000 (13:50 +0200)]
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header
The 1.3 release branch of OpenH264 (as well as the master branch)
have been updated so that GCC no longer warns about this variable
as being unused.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anshul Maheshwari [Tue, 20 Jan 2015 10:40:36 +0000 (16:10 +0530)]
changed name of erase_display_memory to screen_changed
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Tue, 20 Jan 2015 10:29:48 +0000 (15:59 +0530)]
Initilaize array to known size
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Tue, 20 Jan 2015 10:24:58 +0000 (15:54 +0530)]
CHAR_DEBUG to av_dlog
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Tue, 20 Jan 2015 10:21:23 +0000 (15:51 +0530)]
Cosmetic changes in cc_caption
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 20 Jan 2015 01:51:33 +0000 (02:51 +0100)]
Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set"
Fixes regression
Fixes Ticket4274
Suggested-by: kierank
This reverts commit
fe439c20698fc4992b9373cb068efb438fe1a098.