RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,099 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

73099 Commits

Author SHA1 Message Date
Michael Niedermayer a75d22445e ffprobe: check av_asprintf() for failure 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 01:45:27 +02:00
Michael Niedermayer df037fe107 avcodec/smvjpegdec: assert that the pixel format that has been set by our decoder is valid 
If we do check av_pix_fmt_desc_get() then we should fail and
not continue with an invalid pix_fmt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 00:51:29 +02:00
Michael Niedermayer e0db41316a avfilter/drawutils: Fix format validity check in ff_draw_init() 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-13 00:06:28 +02:00
Michael Niedermayer ea37df2d52 avutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize() 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 23:23:59 +02:00
Michael Niedermayer 2cbadf51e8 Merge commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d' 
* commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d':
  fft-test: Use the float fabs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 23:12:06 +02:00
Michael Niedermayer fd04082af9 Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd' 
* commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd':
  on2avc: Use the integer abs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 23:04:30 +02:00
Michael Niedermayer 00ebf89dcd Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91' 
* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
  flv: Name an enum and use its type

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 22:55:49 +02:00
Michael Niedermayer e1ec9c7fb6 Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d' 
* commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d':
  cws2fws: Close file handles on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 22:46:10 +02:00
Michael Niedermayer 6cfaa51acb Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6' 
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
  avconv_opt: Check localtime() return value

Conflicts:
	ffmpeg_opt.c

See: 8e91d9652e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 22:38:44 +02:00
Michael Niedermayer 449c74f629 Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e' 
* commit '8a78ae2d2101622fd244b99178d8bc61175c878e':
  segment: Check open_null_ctx() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 22:10:47 +02:00
Michael Niedermayer 63b0356274 Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb' 
* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb':
  h264_qpel: Use the correct header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:55:40 +02:00
Michael Niedermayer b68b5ec513 Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a' 
* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
	libavcodec/x86/h264_weight.asm

See: e100966575
See: fb2288834b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:47:01 +02:00
Michael Niedermayer 85d0df0c30 Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b' 
* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
  eamad: Use the correct headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:42:50 +02:00
Michael Niedermayer d52c5e9d75 Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8' 
* commit '8606e881b02bec2ac24943d22c8afe11d641fac8':
  mpeg12: Move the vlc bits to a stand alone file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:34:22 +02:00
Michael Niedermayer dbf172e6f4 Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd' 
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:25:21 +02:00
Andreas Cadhalpun 1189af4292 h264: update avctx width/height/pix_fmt when returning frame 
Inconsistencies between the dimensions/pixel format of avctx and the
frame can confuse API users.
For example this can crash the demuxing_decoding example.

Back up the previous values and restore them, when decoding the next
frame. This is necessary, because these can be different between the
returned frame and the last decoded frame.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-12 21:22:00 +02:00
Michael Niedermayer b5c71fba59 Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b' 
* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
  mpegvideo: rv10: Move function declaration to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 21:05:57 +02:00
Michael Niedermayer 218f58a16a Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d' 
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
  mpegvideo: h263: Move all tables to a single file

Conflicts:
	libavcodec/h263.h
	libavcodec/h263data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 20:57:37 +02:00
Michael Niedermayer 58f63670e1 Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25' 
* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 20:47:14 +02:00
Przemysław Sobala c39637f36a libavcodec/imgconvert.c: support left band while cropping 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 19:52:30 +02:00
Michael Niedermayer d0061e77cd avformat/mxfdec: Detect jpeg2000 through codec_ul too 
Fixes Ticket2345

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 19:40:48 +02:00
Paul B Mahol ce3bcb9479 doc/filters: add one more zoompan example 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-12 17:34:05 +00:00
wm4 7e240f9581 matroskadec: verify seekhead IDs 
Some files have SeekHead elements with broken IDs. They mismatch with
the ID of the destination element. These files are written by
"IDMmkvlib0.1" (as identified by the MuxingApp and WritingApp elements),
and the SeekHead IDs are actually endian-swapped.

This confuses the SeekHead logic of the demuxer. It will read some
elements twice, because the SeekHead ID is used to identify and remember
already read elements. With the file at hand, the stream list was
duplicated by reading the Tracks element twice.

Fix this by rejecting invalid EBML IDs in SeekHead entries. (This fix is
relatively specific to the broken file at hand, and doesn't protect
against some other cases of broken SeekHead, such as valid but
mismatching target element IDs.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 19:30:11 +02:00
Paul B Mahol cfe8a89b00 avfilter/vf_zoompan: support planar rgb pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-12 17:15:20 +00:00
Vittorio Giovara 3b73d5c942 fft-test: Use the float fabs() version 
Fixes clang warning "absolute value function 'fabsf' given an argument
of type 'double' but has parameter of type 'float' which may cause
truncation of value [-Wabsolute-value]".
 2015-06-12 17:15:18 +01:00
Vittorio Giovara 2d5176fad1 on2avc: Use the integer abs() version 
Fixes clang warning "floating point absolute value function 'fabsf'
when argument is of integer type [-Wabsolute-value]".
 2015-06-12 17:02:49 +01:00
Vittorio Giovara a7ac1a7b94 flv: Name an enum and use its type 2015-06-12 17:02:49 +01:00
Vittorio Giovara 30dfc1dad4 cws2fws: Close file handles on error 
Reported-By: infer
 2015-06-12 17:02:49 +01:00
Vittorio Giovara a9b2a51178 avconv_opt: Check localtime() return value 
Reported-By: infer
 2015-06-12 17:02:48 +01:00
Vittorio Giovara 8a78ae2d21 segment: Check open_null_ctx() return value 
Reported-By: infer
 2015-06-12 17:02:48 +01:00
Vittorio Giovara b7a4127a45 h264_qpel: Use the correct header 2015-06-12 17:02:48 +01:00
Michael Niedermayer 5e87080f2c h264_weight: Fix SSSE3 biweight code with weights of 128 
CC: libav-stable@libav.org
Sample-Id: test_bref.mp4

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-12 17:02:48 +01:00
Michael Niedermayer 971b377960 avcodec/jpeg2000dec: Reduce verbosity of get_plt() 
The existence of such element does not represent an error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 16:48:57 +02:00
Michael Niedermayer 5b2f9790e6 avcodec/jpeg2000dec: Fallback to yuv if no matching xyz format exists 
Fixes Ticket4471

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 16:44:11 +02:00
Michael Niedermayer eaa8685033 avcodec/jpeg2000dec: Do not abort if prc is outside limits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 16:30:50 +02:00
Michael Niedermayer 8e91d9652e ffmpeg_opt: Check for localtime() failure 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 15:36:20 +02:00
Michael Niedermayer 80b5a1e2ee Mark vectors as NAN instead of dereferencing NULL pointers on malloc failure 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 15:06:32 +02:00
Michael Niedermayer ae0148ff60 swscale: Assert that pixel format descriptor is not NULL 
This may help static analyzers, the pixel format is checked
during initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 14:47:37 +02:00
Michael Niedermayer 3dea13e710 avcodec/jpeg2000dec: Assert that pixel format descriptor is not NULL 
We only look up pixel formats from a fixed list so none should ever
fail to be found

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 14:33:53 +02:00
Michael Niedermayer d59a033a69 avformat/mpegts: recognizes and export private streams 
Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 13:59:00 +02:00
Michael Niedermayer 04f0002291 configure: Disable VSX on unspecified / generic CPUs 
Fixes fate tests on PPC64be

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 13:37:04 +02:00
Luca Barbato 64a2e84416 eamad: Use the correct headers 
Untangle eamad from the mpeg12.h header and speed up rebuilding.
 2015-06-12 12:29:46 +01:00
Luca Barbato 8606e881b0 mpeg12: Move the vlc bits to a stand alone file 2015-06-12 12:29:46 +01:00
Vittorio Giovara f1fa1eed2a mpegvideo: Expand macro 
Having this macro in an header only facilitates the use of such header.
The code increase is minimal and files have one less dependency
on mpegvideo.h.
 2015-06-12 12:29:46 +01:00
Vittorio Giovara e7af52a68d mpegvideo: rv10: Move function declaration to a separate header 2015-06-12 12:26:54 +01:00
Vittorio Giovara e3d0f49abb mpegvideo: h263: Move all tables to a single file 2015-06-12 12:26:04 +01:00
Vittorio Giovara 8b5007a31b mpegvideo: Move ER functions to a separate file 2015-06-12 11:57:26 +01:00
Michael Niedermayer e7adb02d3b avcodec/jpeg2000dec: Do not hardcode tile part usage 
Fixes part of Ticket 4605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 04:51:37 +02:00
Michael Niedermayer 1b3fbe41c5 avcodec/jpeg2000dec: Do not print a warning for RLCP 
It seems to be working now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 04:51:30 +02:00
Michael Niedermayer 4af9eb4f75 avcodec/jpeg2000dec: Remove unused variable and argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-12 03:33:31 +02:00