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

62826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
0a266cb55a avcodec/vorbisdec: try to workaround libvorbisenc bug 
Fixes Ticket3590

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 05:23:37 +02:00
Michael Niedermayer
5b393766ba Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 
* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:46:38 +02:00
Michael Niedermayer
37ce3188de Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521' 
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
  h264: drop commented out cruft

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:38:13 +02:00
Michael Niedermayer
b3d48c315d Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd' 
* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
  mpegvideo: remove unused MpegEncContext.b4_stride

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:28:51 +02:00
Michael Niedermayer
8b30702c44 Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1' 
* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:23:01 +02:00
Michael Niedermayer
ed72dae4cf ffmpeg: dont print "Conversion failed" if conversion has never started 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 23:45:22 +02:00
gcocherel
2eddf3a6ef avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1d76d74cb5633aa9702828d863050e2) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 22:43:25 +02:00
Michael Niedermayer
978c193d47 cmdutils: omit deprecated codec ids in help output 
These ids should be meaningless for the end user and would only
confuse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 22:13:35 +02:00
Michael Niedermayer
375a0c03a9 avformat/xwma: fix memleak of dpds_table 
Fixes CID1087092
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 20:48:03 +02:00
Michael Niedermayer
cf4dbe9aff avformat/xwma: improve error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 20:47:00 +02:00
Michael Niedermayer
c31ad87bc6 avformat/xwma: use NULL instead of 0 for pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 20:41:58 +02:00
Michael Niedermayer
03b88f6b39 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
  lavf/concatdec: implement automatic conversions.
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: always do stream matching.
  lavf/concatdec: check match_streams() return value.
  lavf/concatdec: use a structure for each stream.
  ffprobe: use the codec descriptor if no decoder was found.
  lavf/matroska: add "binary" pseudo-MIME type.
  lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
  lavc: add a mime_types field to codec descriptors.
  lavc: add AV_CODEC_ID_BIN_DATA.
  lavc: add codec descriptors for TTF and OTF.
  lavc: add codec descriptors for deprecated ids.
  lavc/codec_desc: add separation comment.
  tools/ffhash: implement base64 output.
  tools/ffhash: use av_hash_final_hex().
  lavu/hash: add hash_final helpers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 19:29:48 +02:00
Michael Niedermayer
4506ed336f avformat/img2_alias_pix: fix 2 unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 18:47:27 +02:00
Michael Niedermayer
f694ca7ca7 avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 18:39:24 +02:00
Hendrik Leppkes
a7c5fddac8 avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header 
This avoids issues with inconsistent headers with different versions of mingw-w64 and older MSVC variants.

Fixes FATE builds of MSVC 2010.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-29 16:50:43 +02:00
Michael Niedermayer
217f6c53e5 Merge commit '5a70a783f04919514efec7751d710b64d8975fd7' 
* commit '5a70a783f04919514efec7751d710b64d8975fd7':
  hls: Add an option to prepend a baseurl to the playlist entries

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 16:37:22 +02:00
Michael Niedermayer
fd601ba6b1 Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f' 
* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
  segment: Add an option to prepend a string to the list entries

Conflicts:
	doc/muxers.texi
	libavformat/segment.c

See: 5e278c19c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 15:57:43 +02:00
Michael Niedermayer
6a0b5e3476 avcodec/mpegvideo: fix null pointer dereference 
Fixes: 111342.ogm with ffplay
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 14:52:12 +02:00
Anton Khirnov
9d76dd952f h264: drop commented out cruft 2014-04-29 14:49:42 +02:00
Anton Khirnov
c1f92d1358 mpegvideo: remove unused MpegEncContext.b4_stride 2014-04-29 14:49:42 +02:00
Anton Khirnov
6a13505c06 mpegvideo: move the MpegEncContext fields used from arm asm to the beginning 
This should reduce the frequency with which the offsets need to be
updated.
 2014-04-29 14:49:42 +02:00
Nicolas George
41334fcab4 lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
Nicolas George
50ed6e3ce6 lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02:00
Nicolas George
9d24a536a3 lavf/concatdec: reindent after last commit. 2014-04-29 13:25:59 +02:00
Nicolas George
b24d6c5303 lavf/concatdec: always do stream matching. 2014-04-29 13:25:59 +02:00
Nicolas George
c27939d871 lavf/concatdec: check match_streams() return value. 2014-04-29 13:25:59 +02:00
Nicolas George
e973cf04f6 lavf/concatdec: use a structure for each stream. 2014-04-29 13:25:59 +02:00
Nicolas George
43ca94a633 ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
Nicolas George
c9212abf95 lavf/matroska: add "binary" pseudo-MIME type. 
Avoid long scan and "Could not find codec parameters for stream"
error when an attachment has this type.
 2014-04-29 13:25:59 +02:00
Nicolas George
70beebe357 lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types. 
The minor bump also covers AV_CODEC_ID_BIN_DATA.
 2014-04-29 13:25:52 +02:00
Nicolas George
1bf6396498 lavc: add a mime_types field to codec descriptors. 2014-04-29 13:24:18 +02:00
Nicolas George
6ea1196673 lavc: add AV_CODEC_ID_BIN_DATA. 2014-04-29 13:24:18 +02:00
Nicolas George
892e2c2ad8 lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
Nicolas George
fa7bc7ed8b lavc: add codec descriptors for deprecated ids. 2014-04-29 13:24:18 +02:00
Nicolas George
e419e29e1c lavc/codec_desc: add separation comment. 2014-04-29 13:24:17 +02:00
Nicolas George
73c4b6ce4b tools/ffhash: implement base64 output. 
Also fix usage string: the algorithm is not optional.
 2014-04-29 13:24:17 +02:00
Nicolas George
3926a30b58 tools/ffhash: use av_hash_final_hex(). 2014-04-29 13:24:17 +02:00
Nicolas George
b804eb4323 lavu/hash: add hash_final helpers. 
The helpers use local memory to compute the final hash,
making AV_HASH_MAX_SIZE safe to use.
 2014-04-29 13:24:11 +02:00
Luca Barbato
5a70a783f0 hls: Add an option to prepend a baseurl to the playlist entries 
Useful to generate playlists with absolute paths.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-29 12:14:11 +02:00
Enrique Arizón Benito
5c08ae4f37 segment: Add an option to prepend a string to the list entries 
Useful to generate lists with absolute urls.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-29 12:14:00 +02:00
Reynaldo H. Verdejo Pinochet
5b881499a8 ffserver: do not ignore lseek() return 
Should fix FFmpeg Coverity Scan issue #732177

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-29 01:08:06 -04:00
Reynaldo H. Verdejo Pinochet
898192e029 ffserver: do not ignore getsockname() return 
Should fix FFmpeg Coverity Scan issue #732176

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-28 23:54:58 -04:00
Reynaldo H. Verdejo Pinochet
e79bc6a88a ffserver: do not ignore send() return 
Should fix Coverity Scan issue #732178

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-28 23:54:58 -04:00
Reynaldo H. Verdejo Pinochet
8baa5b32a5 ffserver: do not ignore setsockopt return 
Should fix FFmpeg Coverity Scan issue #732181

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-28 23:54:58 -04:00
Reynaldo H. Verdejo Pinochet
6d953ae2c4 ffserver: do not ignore ff_socket_nonblock return 
Should fix FFmpeg Coverity Scan issues #732180 & #732182

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-28 23:54:46 -04:00
Michael Niedermayer
ede411dd03 avcodec/vc1_parser: fix use of uinitialized memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 04:30:53 +02:00
Michael Niedermayer
7c71076470 avutil/log: fix memleak from 669a09fb37 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 03:13:51 +02:00
Michael Niedermayer
648f7a6ec5 ffmpeg_dxva2: fix mixing of declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 01:54:42 +02:00
Michael Niedermayer
21c7e99659 Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 01:47:53 +02:00
Michael Niedermayer
c6eee3120a Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 01:22:22 +02:00