RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
68,647 Commits 36 Branches 392 Tags 313 MiB
Commit Graph

68647 Commits

Author SHA1 Message Date
Michael Niedermayer 0c7733904e Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06' 
* commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06':
  asvenc: Forward the error instead of asserting on it

Conflicts:
	libavcodec/asvenc.c

Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 12:04:31 +01:00
wm4 a400edbb6d lavu/frame: fix malloc error path in av_frame_copy_props() 
The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 04:46:30 +01:00
Carl Eugen Hoyos 4fa42e04ed configure: Set the default for --shlibdir to --libdir. 
Fixes ticket #4183.

Reviewed-by: Ivan Kalvachev
 2014-12-15 02:49:55 +01:00
Ronald S. Bultje cae893f692 vp9/x86: sse2 MC assembly. 
Also a slight change to the ssse3 code, which prevents a theoretical
overflow in the sharp filter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 02:34:05 +01:00
Carl Eugen Hoyos 4373a25d94 lavf/mxfdec: Fix memleaks reading corrupt files. 
Fixes ticket #4173.

Reviewed-by: Tomas Härdin
 2014-12-15 01:37:12 +01:00
Carl Eugen Hoyos 27bdfd29f1 lavf/mxfdec: Factorize mxf_read_close(). 
This will allow to fix leaks in a subsequent commit.
 2014-12-15 01:31:12 +01:00
Ronald S. Bultje fd77fbb390 vp9/x86: 32bit and sse2 support for vp9 inverse transform assembly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 00:38:05 +01:00
Michael Niedermayer 4efdb29c75 avformat/dv: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 00:38:05 +01:00
Lukasz Marek 00dc2859f0 cmdutils: use macros for device test 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-14 23:55:41 +01:00
Lukasz Marek b3311f3cc9 lavd/alsa-audio-common: mark default device in device list 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-14 23:55:41 +01:00
Lukasz Marek 279412c833 lavd/avdevice: use better option types for caps options 
Using dedicated types allows to use format/layout names,
not just raw int values.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-14 23:55:41 +01:00
Michael Niedermayer 829099545b Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d' 
* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
	ffmpeg_opt.c

See: e479013ae4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:54:49 +01:00
Michael Niedermayer 27f2e211aa Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816' 
* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:23:53 +01:00
Michael Niedermayer 3f679f73a2 Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021' 
* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:14:58 +01:00
Michael Niedermayer 0b30d186f1 Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9' 
* commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9':
  vdpau: revector macro to reduce line span

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:07:41 +01:00
Michael Niedermayer add040ff01 Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a' 
* commit 'e10e6651b50b4087f08813f3e503620db7413d3a':
  thread: use "" instead of <> for including the w32pthreads wrapper

See: 32eadfe453
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:06:33 +01:00
Thiago Santos bab8d73765 vaapi: wrap codec specific functions in appropiate #ifs 
Fix linking when only a subset of vaapi decoders is enabled.

Bug-Id: 760
CC: libav-stable@libav.org

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-12-14 22:04:38 +01:00
Michael Niedermayer 5a82ad644f svq1dec: Unbreak the scratch buffer allocation 
The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.

Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.

Introduced in 7b588bb691.

Bug-Id: 766
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-12-14 22:03:58 +01:00
Luca Barbato bcbdeb318e asvenc: Forward the error instead of asserting on it 
Bug-Id: CID 732997
CC: libav-stable@libav.org
 2014-12-14 22:03:22 +01:00
Michael Niedermayer a29524bf2e avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference() 
Fixes Ticket3686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 20:56:59 +01:00
Michael Niedermayer 8ddfc00ab7 avformat/mp3dec: Name the dummy variable as what it is, to avoid confusion 
Found-by: nattyzs <nattyzs@163.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 20:08:13 +01:00
Julien Ramseier fd665f7f48 avconv: Use the mpeg12 private option scan_offset 
Introduced in aed7900704

Bug-Id: debian/773055
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:34:54 +01:00
Rémi Denis-Courmont 559fa0d41b vdpau: add mapping for H.264 Constrained Baseline profile and fallback 
Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:30:03 +01:00
Rémi Denis-Courmont 8502c1e9ff vdpau: add mapping for H.264 Extended profile 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:29:27 +01:00
Rémi Denis-Courmont 8b51bcfed7 vdpau: revector macro to reduce line span 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:29:07 +01:00
Anton Khirnov e10e6651b5 thread: use "" instead of <> for including the w32pthreads wrapper 
Found-by: Dave Yeo <dave.r.yeo@gmail.com>
 2014-12-14 18:15:57 +01:00
Michael Niedermayer ed86dbd05d avformat/aviobuf: Check that avio_seek() target is non negative 
Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 17:39:53 +01:00
Michael Niedermayer 6de2f027cd avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 15:56:32 +01:00
Michael Niedermayer eb055295bd avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 15:54:45 +01:00
Michael Niedermayer ad2deb02e5 avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers() 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 14:30:45 +01:00
Michael Niedermayer 3b537eab27 avformat/nutenc: store the actual r_frame_rate in the corresponding field if available 
Fixes Ticket 3629 part3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 02:12:49 +01:00
Michael Niedermayer 28a6f970f6 ffmpeg: forward r_frame_rate to the muxer in case of stream copy 
Fixes Ticket3629 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 02:12:49 +01:00
Michael Niedermayer add46edf33 avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration() 
This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage

Fixes Ticket3629 part1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 02:12:49 +01:00
Clément Bœsch d823edee8d avcodec: fix wording in AVSubtitleRect doxy 2014-12-13 23:35:22 +01:00
Rob Sykes 4b6f225374 swresample/soxr_resample: fix error handling 
Fixes CID1257659

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 21:12:56 +01:00
Michael Niedermayer d5a263f480 fix "than" typo 
Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 20:52:31 +01:00
Michael Niedermayer 53496aa7f3 avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 19:20:10 +01:00
Michael Niedermayer 609a73b6ff avfilter/vf_uspp: fix gray pixfmt handling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 17:16:49 +01:00
Michael Niedermayer 3dd5f7aaa0 avfilter/vf_uspp: fix used chroma subsampling factors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 16:54:13 +01:00
Michael Niedermayer 354fda7698 avfilter/vf_uspp: fix used pix_fmt 
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 16:38:44 +01:00
Michael Niedermayer 5d0cfb58ef avcodec/dvdsubdec: Avoid strerror() due to thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 15:15:07 +01:00
Michael Niedermayer 3ab82e9206 avcodec/libxvid_rc: Avoid strerror() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 15:12:37 +01:00
Michael Niedermayer d7de48f0df avformat/mov: Simplify code by using OFFSET() and FLAGS macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 15:06:19 +01:00
Michael Niedermayer 43fb40c3c3 avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 14:18:30 +01:00
Michael Niedermayer 498396f80c avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 14:18:30 +01:00
Michael Niedermayer 792a5004a1 avfilter/vf_uspp: Add grayscale support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 05:48:28 +01:00
Michael Niedermayer b898c49ba1 avfilter/vf_uspp: assert that the qp_type is valid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 05:48:28 +01:00
Lou Logan 10ef8f063b doc: add FFREPORT example 
And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-12 16:51:16 -09:00
wm4 a963fdb0ea lavu/dict: check for malloc failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-12 23:40:50 +01:00
wm4 a66893ac94 avformat/utils: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-12 23:37:29 +01:00