RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
69,568 Commits 37 Branches 400 Tags 268 MiB
Commit Graph

69568 Commits

Author SHA1 Message Date
Michael Niedermayer d0f315ab6c avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 16:44:00 +01:00
Michael Niedermayer 3531594017 ppc/mpegvideo_altivec: Change assert to av_assert2() 
And move it to where the variable is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 16:43:14 +01:00
Paul B Mahol be128c1e34 avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:11 +00:00
Paul B Mahol 3db9960e0a avcodec/qdm2: remove unneeded #include, there are no assert() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:11 +00:00
Paul B Mahol 5274860fe2 ffmpeg: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:11 +00:00
Paul B Mahol 80cbf13725 avformat/rtpdec_qdm2: change assert to av_assert0() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:10 +00:00
Christophe Gisquet 1fa637d2ef ffmpeg: free_input_threads requires HAVE_PTHREADS 
Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 14:47:08 +01:00
Carl Eugen Hoyos 50144b91ea Respect horizontal differencing predictor for 16bit gray tiff images. 
Fixes ticket #4291.
 2015-01-30 14:12:55 +01:00
Stefano Sabatini 40b026b1d0 doc/muxers/segment: document strftime option 
It was added in commit 202947a066.
 2015-01-30 11:52:37 +01:00
Paul B Mahol 64815d1f0c avformat/nut: support WavPack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 09:33:49 +00:00
Paul B Mahol b5004f3213 avformat/nut: add GIF[0] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 08:58:33 +00:00
Michael Niedermayer a73c411809 avcodec/aacdec: remove unneeded #include, theres no assert() in aacdec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 02:29:38 +01:00
Michael Niedermayer 305cbe76d3 avcodec/wma: remove unneeded #includes, there are no assert() only av_assert* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 02:26:17 +01:00
Michael Niedermayer 2b215b7f5a avcodec/hevc: Check for av_malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 00:44:51 +01:00
Michael Niedermayer 5008605bf2 avcodec/hevc: Replace more mallocs by av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 00:44:50 +01:00
Anshul Maheshwari 93fac23b80 avcodec/ccaption_dec: Adding color and fonts for future use in screen 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-30 00:04:51 +01:00
Lou Logan 961f2e3aac doc/indevs: add some XCB info to x11grab 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-01-29 13:12:13 -09:00
Michael Niedermayer ccccfb59b1 Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f' 
* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 22:43:36 +01:00
Michael Niedermayer 89c35b1130 Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1' 
* commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1':
  flacenc: initialize sums matrix

Conflicts:
	libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 22:34:54 +01:00
Michael Niedermayer c16896f525 Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0' 
* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
  ituh263dec: use macro instead of #if

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 22:02:22 +01:00
Michael Niedermayer c2ad22ff99 Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4' 
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
	libavformat/yuv4mpegdec.c

See: 52a17972de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:55:02 +01:00
Michael Niedermayer e18e5ae62c Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a' 
* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
  mpegvideo_enc: initialize the encoding context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:36:20 +01:00
Michael Niedermayer 56252a5e09 Merge commit '1a07df31128da3a0020b66502399989b91770d44' 
* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

Conflicts:
	Changelog
	libavcodec/dnxhddata.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:21:49 +01:00
Michael Niedermayer 64e7cf1253 Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3' 
* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
  DNxHD: Simplify pixel format detection

Conflicts:
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:54:25 +01:00
Michael Niedermayer e5b7e2224f Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65' 
* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:38:35 +01:00
Michael Niedermayer bcadf5d940 Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425' 
* commit '1279221cc4d63bc4449df86ae7a98e633f8be425':
  lavu: Check av_dict_set allocations

Conflicts:
	libavutil/dict.c

See: a963fdb0ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:28:24 +01:00
Vittorio Giovara 22b985d59c hqdn3d: check memory allocations and propagate errors 2015-01-29 17:33:38 +00:00
Vittorio Giovara 70d246d5cc flacenc: initialize sums matrix 
CC: libav-stable@libav.org
Bug-Id: CID 703821
 2015-01-29 17:33:38 +00:00
Vittorio Giovara c01ccccbb1 ituh263dec: use macro instead of #if 2015-01-29 17:33:34 +00:00
Vittorio Giovara 08fa34bf75 yuv4mpegdec: initialize field_order in yuv4_read_header() 
CC: libav-stable@libav.org
Bug-Id: CID 1265721
 2015-01-29 15:26:33 +00:00
Vittorio Giovara 302ca6b20e mpegvideo_enc: initialize the encoding context 
This prevents several uninitialized variable uses that take
place towards the end of encoding.

CC: libav-stable@libav.org
Bug-Id: CID 700760
 2015-01-29 15:26:33 +00:00
Vittorio Giovara 1a07df3112 DNxHD: Add support for id 1258 (DNx100 960x720@8) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-29 15:04:57 +00:00
Vittorio Giovara 598f7d046c DNxHD: Simplify pixel format detection 
Error out in case of unknown values.
 2015-01-29 15:04:46 +00:00
Vittorio Giovara 41e03e284e DNxHD: More verbose error messages 2015-01-29 15:04:35 +00:00
Luca Barbato 1279221cc4 lavu: Check av_dict_set allocations 
Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-29 14:59:57 +00:00
Zhang Rui 038f3a173f avformat/concatdec: avoid NULL dereference when failed to open file. 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 14:25:04 +01:00
Michael Niedermayer d39fa69dfc Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743' 
* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
  libopenh264: Log debug messages to a non-null context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 14:13:25 +01:00
Stefano Sabatini d43c1ec684 examples/filtering: extend comments about setting the filter graph endpoints 
That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.
 2015-01-29 11:12:39 +01:00
Stefano Sabatini af7b89e08b lavfi: document assumptions about the input and output labels of a filter graph description 2015-01-29 10:12:34 +01:00
Stefano Sabatini d11fcf735f doc/filters: apply some updates to the Filtergraph syntax section 2015-01-29 10:12:34 +01:00
Martin Storsjö 6996fd204a libopenh264: Log debug messages to a non-null context 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-29 09:16:35 +02:00
Arwa Arif a21acd554a Fix frame-alignment in PP7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 04:38:48 +01:00
Michael Niedermayer 4155f2d7cc Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 03:02:09 +01:00
Supraja Meedinti 6ad749b533 libavutil: Added twofish symmetric block cipher 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 01:56:11 +01:00
Carl Eugen Hoyos 3ea97767e4 Add an ARES atom to extradata when encoding avui. 
Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de
 2015-01-29 01:07:08 +01:00
Michael Niedermayer 72db3c79df Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd' 
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

See: ecbf838c7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 22:44:09 +01:00
Michael Niedermayer 58ed152857 avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers 
This undoes the effect of 3c18a7b188 for reading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:56:50 +01:00
Michael Niedermayer 0b4fc4bacd Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b' 
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:37:28 +01:00
Michael Niedermayer 37984ca133 Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff' 
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:29:29 +01:00
Paul B Mahol c099783316 avformat/nsvdec: remove case which is no longer possible 
Check of channels !=0 is right above.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 17:57:48 +00:00