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

69212 Commits

Author SHA1 Message Date
Jon Morley 47372caac5 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>
 2015-01-23 13:14:15 +01:00
Michael Niedermayer 0982077be5 Merge commit '9108967513fcaff3d55514a7bca4c9fbba128c71' 
* commit '9108967513fcaff3d55514a7bca4c9fbba128c71':
  rtspdec: Consistently use rtsp_hd_out for writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 12:26:47 +01:00
Martin Storsjö 9108967513 rtspdec: Consistently use rtsp_hd_out for writing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-23 10:33:00 +02:00
Michael Niedermayer b4f5da2651 avutil/buffer: factor buffer_replace() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 04:45:05 +01:00
Michael Niedermayer ecd39520b8 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>
 2015-01-23 00:47:24 +01:00
Werner Robitza 4b46ce8e91 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>
 2015-01-22 23:13:08 +01:00
Michael Niedermayer 9353ed9e94 Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e' 
* commit '6341ab0ad3fde9583138e121f518e21cde15258e':
  libx265: Pass through user-set frame type

See: 41e983f1a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 22:52:01 +01:00
Michael Niedermayer e32b07aea4 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>
 2015-01-22 19:52:52 +01:00
Derek Buitenhuis 41e983f1a6 libx265: Pass through user-set frame type 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-01-22 16:30:27 +00:00
Derek Buitenhuis 6341ab0ad3 libx265: Pass through user-set frame type 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-01-22 16:29:30 +00:00
Michael Niedermayer a30fd828ab avfilter/avf_showcqt: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 13:56:30 +01:00
Michael Niedermayer f77571f6bb avfilter/drawutils: Check for av_malloc* failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 13:54:26 +01:00
Michael Niedermayer c90069c6ba avfilter/drawutils: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 13:50:30 +01:00
Michael Niedermayer b942a71eaa 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>
 2015-01-22 13:26:29 +01:00
Michael Niedermayer bbdd940f36 doc/APIchanges: Fill in some more missing hash values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 13:09:21 +01:00
Michael Niedermayer 146a2c4e7f 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>
 2015-01-22 12:36:45 +01:00
Michael Niedermayer b7f8e6dd8c Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d' 
* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
  dashenc: Use inttypes.h macros for format strings instead of %lld

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 12:06:47 +01:00
Michael Niedermayer 526f7ef211 Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf' 
* commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf':
  dashenc: Fix format string generation

See: 89684883af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 11:55:56 +01:00
Rodger Combs 89684883af avformat/dashenc: fix format string generation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 11:55:21 +01:00
Martin Storsjö 3a724a7f3b dashenc: Use inttypes.h macros for format strings instead of %lld 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-22 08:49:41 +02:00
Rodger Combs 1d8aa23794 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>
 2015-01-22 08:49:39 +02:00
Carl Eugen Hoyos 6c559a0a9d lavc/pnm: Support decoding ya16. 2015-01-22 01:49:04 +01:00
Carl Eugen Hoyos 196dd72bcf lavc/pamenc: Support encoding ya16be. 2015-01-22 01:47:54 +01:00
Carl Eugen Hoyos c2e36e07cd lavc/tiffenc: Support encoding ya16le. 2015-01-22 01:38:58 +01:00
Carl Eugen Hoyos c6a36f6931 lavc/pngenc: Support encoding ya16be. 2015-01-22 01:33:05 +01:00
Brian Brice f845ae0c8e librtmp: Allow changing the socket send buffer size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 22:24:28 +01:00
Christophe Gisquet 9a9b088d9e libavformat/img2dec: fix warning when !HAVE_GLOB 
Variables are unused in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:51:28 +01:00
Michael Niedermayer 5f764f43d2 Merge commit 'da9bffaf08a1173451da1b4e1ae50881e7093642' 
* commit 'da9bffaf08a1173451da1b4e1ae50881e7093642':
  doc/platform: Reference only MSYS2 and MinGW-w64

Conflicts:
	doc/platform.texi

See: 6c906ded38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:35:11 +01:00
Michael Niedermayer f30798584f swscale/input: fix rgba64 alpha non native 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:21:00 +01:00
Michael Niedermayer 95d04690aa swscale/input: Fix alpha of YA16 input 
Fixes Ticket4278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:21:00 +01:00
Michael Niedermayer fdb9399681 avfilter/vf_showinfo: show timebase & framerate too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:21:00 +01:00
Paul B Mahol 7849ce438e avfilter/vf_lenscorrection: support 8bit planar RGB formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-21 18:05:51 +00:00
Derek Buitenhuis 6c906ded38 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>
 2015-01-21 13:58:02 +00:00
Derek Buitenhuis da9bffaf08 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>
 2015-01-21 13:57:03 +00:00
Michael Niedermayer 0d64982828 doc/APIchanges: fill in and correct some values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 14:24:08 +01:00
Michael Niedermayer f7a1c5e4d2 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>
 2015-01-21 14:14:46 +01:00
agathah dac91bb4c3 avcodec/nvenc: set repeatSPSPPS flag for streaming 
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 13:59:35 +01:00
Michael Niedermayer 47111d366d 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>
 2015-01-21 13:51:26 +01:00
Andreas Cadhalpun 840c3c0531 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>
 2015-01-21 03:20:41 +01:00
Michael Niedermayer 6c9dfa5a1b Merge commit '440119b18836887d98c9e337c5911563bb43588c' 
* commit '440119b18836887d98c9e337c5911563bb43588c':
  libopenh264enc: Move a declaration of a variable into an ifdef

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-20 21:55:23 +01:00
Michael Niedermayer 87c4a80e56 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>
 2015-01-20 21:15:25 +01:00
Michael Niedermayer 9cbaf5849b Merge commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c' 
* commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c':
  smoothstreamingenc: Add a missing "goto fail"

See: f2e12f8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-20 21:09:20 +01:00
Paul B Mahol f191c98e4d avfilter/af_join: swap av_mallocz_array() args for consistency with the prototype 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-20 16:52:30 +00:00
Paul B Mahol 357c6a92bc avfilter/af_join: Use av_mallocz_array() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-20 16:45:19 +00:00
Michael Niedermayer 081e117bfe avfilter/af_ashowinfo: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-20 17:00:16 +01:00
Michael Niedermayer 48895a23fc avdevice/alsa-audio-common: Use *alloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-20 17:00:16 +01:00
Paul B Mahol be1b8b4da5 fix Makefile: remove ilpack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-20 15:48:43 +00:00
Paul B Mahol fd33658f86 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>
 2015-01-20 15:36:31 +00:00
Martin Storsjö 440119b188 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>
 2015-01-20 15:02:50 +01:00
Martin Storsjö bba0247926 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>
 2015-01-20 15:02:38 +01:00