virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
60,720 Commits 37 Branches 400 Tags 465 MiB
8f853159f6
Commit Graph

14497 Commits

Author SHA1 Message Date
Michael Niedermayer
c57fc97e95 avformat/bink: Check return value of av_add_index_entry() 
Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 23:47:05 +01:00
Michael Niedermayer
6742614c23 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 21:26:59 +01:00
Michael Niedermayer
f3bb5f28d3 Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53' 
* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
	libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 21:11:29 +01:00
Diego Biurrun
2f2b2efd31 doxygen: Replace @parblock syntax with manual linebreaks 
@parblock is only supported in very recent Doxygen versions.
 2014-02-17 15:36:17 +01:00
Diego Biurrun
4d7ab5cfeb doxygen: Add a number of missing function parameter descriptions 2014-02-17 15:36:09 +01:00
Michael Niedermayer
38a08e0aea Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:18:44 +01:00
Michael Niedermayer
1fc74926a5 Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
	configure
	doc/Makefile
	doc/doxy-wrapper.sh
	doc/examples/avcodec.c
	doc/examples/decoding_encoding.c
	doc/examples/metadata.c
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
	libavcodec/Makefile
	libavcodec/api-example.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 02:22:01 +01:00
Alexander Strasser
db3c9701f4 lavf/avio: Introduce avio_find_protocol_name 
Make it possible to find out what protocol will be chosen
for a given URL.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-02-16 22:34:21 +01:00
Diego Biurrun
b339182eba Move all example programs to doc/examples 
Also drop support for building examples in library directories.
 2014-02-16 21:37:21 +01:00
Lukasz Marek
81c3f81d6f lavd: add list devices API 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-02-16 20:07:08 +01:00
Michael Niedermayer
05e9e3342f avformat/mov: fix avg_frame_rate calculation 
Fixes integer overflow
Fixes Ticket3390

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 19:05:49 +01:00
Hendrik Leppkes
45581ed15d oggdec/vorbis: fix stream duration condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:30:54 +01:00
Michael Niedermayer
480af3a35c avformat/utils: skip the MPEG-2 style dts/pts code for HEVC 
This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 20:51:10 +01:00
Michael Niedermayer
abb6821e43 Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b' 
* commit '8a2250344b19a343d830a902dbcf4c0b929ea49b':
  jv: detect partial packets in the demuxer

Conflicts:
	libavformat/jvdec.c

See: 9d0c71e5e3
See: b948ab8132
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 01:51:17 +01:00
mrlika
e2707a7cf7 avformat/mpegts: DVB subtitles multiple languages support 
Copy multiple languages data from PMT to extradata. New 5 bytes
per language extradata format.

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 00:01:28 +01:00
Michael Niedermayer
842b6c14bc avformat/mpegtsenc: Check data array size in mpegts_write_pmt() 
Prevents out of array writes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 14:14:12 +01:00
mrlika
af786236cc mpegts muxer: DVB subtitles multiple languages support 
* restore multiple languages data from extradata to PMT table
* setting correctly hearing empaired subtitling type

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 13:43:57 +01:00
Janne Grunau
8a2250344b jv: detect partial packets in the demuxer 
Fixes fate-jv under valgrind which reports a different CRC for the last
frame from a partial read.
 2014-02-12 20:12:18 +01:00
Michael Niedermayer
c320485633 avformat/asfdec: pass on error code from avio_seek() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 17:10:26 +01:00
Michael Niedermayer
3e8b17f05b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  asfdec: fix seeking with fragmented packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 16:36:15 +01:00
Michael Niedermayer
f73901f815 Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3' 
* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 16:16:16 +01:00
Michael Niedermayer
5634c9518f Merge commit '0ebb523f072322972ea446616676fff32e9603c6' 
* commit '0ebb523f072322972ea446616676fff32e9603c6':
  asfdec: check ff_get_guid() return values during seeking

Conflicts:
	libavformat/asfdec.c

The code that pretends that a truncated index is correct and complete is not merged
as it obviously would cause problems if a really truncated index is encountered
If someone has samples that work better with that hack, please share them / mail me

also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 16:04:26 +01:00
Michael Niedermayer
d32926db7f avformat/riff: return error code from ff_get_guid() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 15:59:15 +01:00
Janne Grunau
f5d92d9cab asfdec: fix seeking with fragmented packets 
After seeking fragments with an offset > 0 must be skipped to correctly
assemble packets.

Bug-Id: 43
 2014-02-12 12:52:28 +01:00
Andrew Kelley
0c08256596 asfdec: short-circuit seeking to the start of stream 
Bug-id: 43

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-02-12 12:52:28 +01:00
Janne Grunau
0ebb523f07 asfdec: check ff_get_guid() return values during seeking 
Hitting EOF during seeking is quite likely. Fixes use of uninitialized
data during fate-seek-lavf-asf.
 2014-02-12 12:52:28 +01:00
Michael Niedermayer
a0911b0597 avformat/mov: fix keyframe flags for sample from chromium Issue 340865 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 06:42:04 +01:00
Nicolas George
edc7e67669 lavf/lavd: version bump and APIchanges for uncoded frames. 2014-02-11 10:34:32 +01:00
Nicolas George
dcda5ef1ea lavf: add uncodedframecrc test muxer. 2014-02-11 10:29:02 +01:00
Nicolas George
1b05ac220e lavf: add write_uncoded_frame() API. 2014-02-11 10:29:02 +01:00
Matt Oliver
1ff42685fe avformat/libssh: Fix libssh defaulting to shared linkage. 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-11 01:31:18 +01:00
Michael Niedermayer
8560fdc451 Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703' 
* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703':
  lavf: always unref the packet passed to av_interleaved_write_frame() on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:30:58 +01:00
Zhang Rui
4958628ba6 avformat/concatdec: pass the interrupt callback on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 15:42:48 +01:00
Anton Khirnov
394fb56c29 lavf: always unref the packet passed to av_interleaved_write_frame() on error 2014-02-10 15:08:06 +01:00
Michael Niedermayer
ec8e232b53 Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389' 
* commit '18c896be3d8e926ef806e7de29c4a168d7763389':
  lavf: extend / improve the AVFormatContext doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:18:47 +01:00
Michael Niedermayer
c84280b09c Merge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2' 
* commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2':
  lavf: add some basic documentation of the muxing process

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:09:29 +01:00
Michael Niedermayer
6fd7ea44b2 Merge commit '4c750599509c3973afbe2850953a1fb963f696e5' 
* commit '4c750599509c3973afbe2850953a1fb963f696e5':
  lavf: rewrite the av_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:51:56 +01:00
Michael Niedermayer
58fdc6db6c Merge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b' 
* commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b':
  lavf: rewrite the av_interleaved_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:37:37 +01:00
Marton Balint
6421111b52 lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams 
Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.

Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:58:59 +01:00
Anton Khirnov
18c896be3d lavf: extend / improve the AVFormatContext doxy 2014-02-10 11:46:49 +01:00
Anton Khirnov
54f7e79d47 lavf: add some basic documentation of the muxing process 2014-02-10 11:44:21 +01:00
Anton Khirnov
4c75059950 lavf: rewrite the av_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:37:30 +01:00
Anton Khirnov
ad7f2b69a5 lavf: rewrite the av_interleaved_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:34:41 +01:00
Anton Khirnov
38893dc028 pcmdec: replace a reachable assert with an error check 
Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.
 2014-02-10 07:41:21 +01:00
Michael Niedermayer
cf0e5b7fd4 Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e' 
* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
  lavf: default .ogg audio to libvorbis if we can

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:04:01 +01:00
Janne Grunau
b37effdc52 mxfdec: free descriptor extradata in .read_close() 
Fixes memleak in fate-mxf-demux.
 2014-02-09 18:50:53 +01:00
Andrew Kelley
b0c2c097e4 lavf: default .ogg audio to libvorbis if we can 
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:15 +01:00
Derek Buitenhuis
ef5d32b9c5 Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:29:07 +00:00
Derek Buitenhuis
722554788b Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:15:44 +00:00
Michael Niedermayer
0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00