generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,515 Commits 24 Branches 241 Tags 173 MiB
3942294fd5
Commit Graph

11794 Commits

Author SHA1 Message Date
Paul B Mahol
3bb3cddd96 mmfdec: fix seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 11:56:00 +00:00
Paul B Mahol
9ef29af2e8 cafenc: do not include riff.h 
ff_codec_get_tag() was moved to internal.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:44:28 +00:00
Paul B Mahol
0aabd35b62 lavf/dxa: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:18:04 +00:00
Paul B Mahol
c5008135c2 dxa: signal EOF 
Fixes #1948.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:03:30 +00:00
Paul B Mahol
4727611d48 ircamenc: 10l do not use avio_skip() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:46:35 +00:00
Paul B Mahol
4c18562d02 Ensoniq Paris Audio File demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:01:22 +00:00
Paul B Mahol
880191637f IRCAM demuxer & muxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:01:22 +00:00
Paul B Mahol
8ecf22ffb0 rsodec: use ff_pcm_read_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Paul B Mahol
acac16b5c7 soxdec: use ff_pcm_read_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Paul B Mahol
c090b5427d audec: use ff_pcm_read_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Paul B Mahol
a647eb5a87 pvfdec: use ff_pcm_read_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Paul B Mahol
15ab0393fd avr: use ff_pcm_read_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Paul B Mahol
93dc8ed0a1 pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers 
While here remove pts/dts code, it is apparently not needed and cause
problems for demuxers that will use such function.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 12:40:57 +00:00
Michael Niedermayer
99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 13:34:45 +01:00
Michael Niedermayer
9db3fb6ed8 oggdec: prevent codec from changing through ogg_replace_stream() 
This prevents inconsistencies leading to out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 04:40:19 +01:00
Carl Eugen Hoyos
4e6f9db493 Set some audio stream properties in the vivo demuxer. 
This allows playback with MPlayer and the binary decoder.

Reviewed-by: Paul B Mahol
 2012-12-05 01:21:12 +01:00
Anton Khirnov
cb45553f57 Remove pointless #undefs of previously forbidden functions. 2012-12-04 21:40:22 +01:00
Nicolas George
03847eb825 lavf: compute probe buffer size more reliably. 
The previous code computes the offset by reversing the growth
of the allocated buffer size: it is complex and did lead to
inconsistencies when the size limit is reached.

Fix trac ticket #1991.
 2012-12-04 19:49:51 +01:00
Michael Niedermayer
83ddedbbf2 lavf: the core rfps code needs 2 durations to estimate rfps 
This fixes a regression where this count became 1 with
HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-04 18:04:29 +01:00
Paul B Mahol
a3bb59b163 av_register_protocol is gone :( 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-04 17:01:27 +00:00
Paul B Mahol
481c843a47 rawvideodec: set bit rate 
Fixes #1989.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-04 15:52:58 +00:00
Paul B Mahol
18aaed6475 gifdec: do not handle timestamps 
It is broken, and results will be messed up when seeking.

This also fix duration displayed for streams when using -c copy.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-04 15:21:24 +00:00
Carl Eugen Hoyos
0877f64fea Add debug output when skipping unknown swf tags. 
Reviewed-by: Clément Bœsch
 2012-12-04 15:52:37 +01:00
Michael Niedermayer
dacd6202ec Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: always use pic for shared libraries
  build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
  fate: ea, h264: prettyprinting and ordering cosmetics

Conflicts:
	tests/fate/ea.mak
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-04 14:23:22 +01:00
Paul B Mahol
765debf51f auenc: remove pointless assigment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-04 12:42:50 +00:00
Paul B Mahol
266e88a47c mmf: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-04 11:59:46 +00:00
James Almer
b70251c0ad AST Muxer 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-04 11:25:46 +00:00
James Almer
7f0e7fc9e2 ast: Rename ast.c -> astdec.c 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-04 10:51:38 +00:00
Peter Ross
1696c72af4 iff demuxer: include DEEP TVDC lookup table in extradata buffer 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-04 20:53:26 +11:00
Michael Niedermayer
5e1bacf2d4 matroskadec: reset size when freeing data. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-04 03:50:09 +01:00
Diego Biurrun
62641dce71 build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place 2012-12-03 19:32:03 +01:00
Michael Niedermayer
03290ffb57 mpegts: check that codec is not open in mpegts_find_stream_type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 17:34:38 +01:00
Michael Niedermayer
8897b5aa4c mpegts_set_stream_info: remove unneeded codec id check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 17:29:56 +01:00
Michael Niedermayer
4c160b68cc ff_mp4_read_dec_config_descr: check that the codec is not open 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 17:27:52 +01:00
Michael Niedermayer
b452c8a722 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: fft: Fix libavcodec dependency
  build: Make the ISMV muxer select the MOV muxer
  configure: move arm arch extensions to a separate variable

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 02:59:19 +01:00
Diego Biurrun
31f16dc1a1 build: Make the ISMV muxer select the MOV muxer 
They share the same code, so building one w/o the other makes no sense.
 2012-12-03 01:20:10 +01:00
Michael Niedermayer
ec79b1fc88 wtvdec: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-02 22:36:15 +01:00
Michael Niedermayer
80aa89bdff asfdec: check extradata size before alloc and read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-02 20:44:58 +01:00
Michael Niedermayer
b61ba262a1 mpc8: check seektable size before attempting to use it. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-02 04:21:42 +01:00
Carl Eugen Hoyos
196920060b Add FourCC V264 for H264 in CCTV recordings. 2012-12-02 00:43:39 +01:00
Clément Bœsch
6d2892c9f5 lavf/assdec: return appropriate error code instead of -1. 2012-12-02 00:06:03 +01:00
Clément Bœsch
069c897549 lavf/assdec: add ass_ prefix to callbacks. 2012-12-02 00:06:03 +01:00
Clément Bœsch
e0260e25b0 lavf/assdec: rewrite using the demux subtitles API. 2012-12-02 00:06:03 +01:00
Clément Bœsch
bad4e112a2 lavf: use ff_subtitles_queue_seek() for text subtitles demuxers. 2012-12-02 00:06:03 +01:00
Clément Bœsch
ad5d72b123 lavf/subtitles: seek a little more backward when necessary. 
If some previous subtitles are overlapping with the current time
we make sure they are raised so the renderer can display them too.
 2012-12-02 00:06:03 +01:00
Clément Bœsch
ff3624b1ad lavf/subtitles: add ff_subtitles_queue_seek(). 
This function is almost identical to lavf/assdec:read_seek2(). It
performs a generic seek for text subtitles demuxers for the new seeking
API.

The only difference with assdec:read_seek2 is the ts_diff being
unsigned to avoid overflows.

The seek callback in the ASS demuxer will be removed when it is
redesigned to use FFDemuxSubtitlesQueue.
 2012-12-02 00:06:03 +01:00
Paul B Mahol
56e149fda9 PVF demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-01 21:02:45 +00:00
Carl Eugen Hoyos
5442083b1c Support Sorenson Spark in f4v files streamed by Flash Media Server. 2012-12-01 21:16:11 +01:00
Michael Niedermayer
873049e6d8 mxfdec: check index_tables before dereferencing in close. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-01 20:19:09 +01:00
Paul B Mahol
9d5cfce855 gifdec: rudimentary seeking 
With this ffplay -loop X successfully seeks to start.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-01 11:43:50 +00:00