generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,332 Commits 24 Branches 241 Tags 173 MiB
62a82c66cd
Commit Graph

69332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a915b1daee 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>
 2015-01-23 23:16:03 +01:00
Michael Niedermayer
0c00e734ef Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4' 
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
  hlsproto: Properly close avio buffer in case of error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 22:27:48 +01:00
Michael Niedermayer
da304c529b Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035' 
* commit '4c5fa628da099dbb598c93bc4555b8733d2c3035':
  mov: Do not compute negative SAR values

Conflicts:
	libavformat/mov.c

See: e32b07aea4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 22:21:12 +01:00
Michael Niedermayer
e40cdf8604 Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf' 
* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
	libavcodec/mpegvideo_enc.c

See: 1e78679768
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 22:03:21 +01:00
Michael Niedermayer
72d99c8c26 avformat/dv: check av_malloc() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 18:15:43 +01:00
Michael Niedermayer
d36e66bb26 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>
 2015-01-23 17:45:35 +01:00
rogerdpack
b587ec00f7 dshow: fix docu escapes 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 08:32:27 -07:00
Vittorio Giovara
3a6dfec864 segment: Check av_get_frame_filename() return value 
CC: libav-stable@libav.org
Bug-Id: CID 1265713
 2015-01-23 14:55:03 +00:00
Vittorio Giovara
7915e6741d hlsproto: Properly close avio buffer in case of error 
Fix a memory leak.

CC: libav-stable@libav.org
Bug-Id: CID 717999
 2015-01-23 14:55:03 +00:00
Vittorio Giovara
4c5fa628da mov: Do not compute negative SAR values 
This partially reverts cf70ba37ba, 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>
 2015-01-23 14:54:59 +00:00
Michael Niedermayer
8c8ee17e8d 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>
 2015-01-23 15:11:13 +01:00
Michael Niedermayer
579795b204 avfilter/af_channelmap: Check for missing argument in get_channel_idx() 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 15:03:40 +01:00
rogerdpack
a35da0920d 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>
 2015-01-23 06:54:48 -07:00
rogerdpack
5d72cf0f64 dshow: add options for allowing filter popup configuration dialogs to be presented to the user 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:49:37 -07:00
rogerdpack
ec81ad21c1 dshow: introduce support for crossbar [multiple input selectable] devices 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:35:16 -07:00
rogerdpack
b76a0e24f9 dshow: drop initial audio packets with weird timestamps 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:13:33 -07:00
rogerdpack
8eb5b5ec6f dshow: use non deprecated api 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:07:24 -07:00
Michael Niedermayer
2a06c2a03e 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>
 2015-01-23 15:05:49 +02:00
rogerdpack
e620eee88c dshow: miscellaneous tweaks 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:01:32 -07:00
rogerdpack
d01234419b 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>
 2015-01-23 05:38:14 -07:00
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