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

11913 Commits

Author SHA1 Message Date
Michael Niedermayer
57cee85023 Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
	libavcodec/parser.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:58:56 +01:00
Michael Niedermayer
7efee140d7 get_bits: rename get_bits_longlong to get_bits64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:53:01 +01:00
Michael Niedermayer
b2b12a1022 mpegts: rename get_bits64 to get_ts64 
Renaming because of name conflict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:52:50 +01:00
Reimar Döffinger
8ee14aa5c7 lavf: improve avoid_negative_ts help text 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 13:30:43 +01:00
Paul B Mahol
57231e4d5b tak: demuxer, parser, and decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Michael Niedermayer
41540b36a1 bitstream: add get_bits64() to support reading more than 32 bits at once 
Also remove a duplicate function in the MPEG-TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Clément Bœsch
710c4baf52 lavf: VobSub demuxer. 2012-12-07 21:18:06 +01:00
Paul B Mahol
fe63d41302 brstm: do not return partial packets 
Such packets are useless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 17:55:45 +00:00
Michael Niedermayer
7c425e4f2d Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333' 
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
  h264: check sps.log2_max_frame_num for validity
  mov: validate number of DataReferenceBox entries against box size
  mov: compute avg_frame_rate only if duration is known
  flac: change minimum and default of lpc_passes option to 1

Conflicts:
	libavcodec/h264_ps.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-07 15:52:43 +01:00
Paul B Mahol
8ca8b43d71 lavf/pcm: check size, do not produce invalid packets 
Inspired by 92b8c9d89e.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 13:05:43 +00:00
Janne Grunau
8cc2fa1e5d mov: validate number of DataReferenceBox entries against box size 
Avoids a 2G memory allocation and parsing of random data in
mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.
 2012-12-07 11:43:28 +01:00
Janne Grunau
80b6b31417 mov: compute avg_frame_rate only if duration is known 
Fixes an assert in fuzzed sample sample.mp4_s265930.
 2012-12-07 11:43:28 +01:00
Michael Niedermayer
892750b07b fix tipo 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 22:59:21 +01:00
Michael Niedermayer
656500c503 lavf: improve help text for avoid_negative_ts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 22:06:40 +01:00
Paul B Mahol
547b8aeed4 smacker: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 18:06:52 +00:00
Paul B Mahol
29c3ebf56e siff: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 18:00:37 +00:00
Paul B Mahol
7510a9a466 lavf/apedec: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 17:17:49 +00:00
Nicolas George
32aedebdc5 lavf: add a concat demuxer. 2012-12-06 14:09:14 +01:00
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
Janne Grunau
54c7fe6d68 raw demuxer: initialize end of partial packets 2012-12-05 00:02:43 +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
Paul B Mahol
b912895d94 mvi: check av_mallocz() result 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-01 09:06:24 +00:00
Michael Niedermayer
b90e795f73 check std tag size before reading. 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-01 00:30:11 +01:00
Paul B Mahol
57b00d7ab1 gifdec: remove width and height from demuxer context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-30 16:09:02 +00:00
Paul B Mahol
d56b15017a undo file modifiers that suck in 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-30 15:00:35 +00:00
Vitaliy E Sugrobov
f83657fcf6 Add exception for "gif" in image2 probe() method. 
Without this exception files with ".gif" extension by default
recognized as input suitable for image2 demuxer rather than gif.
In order to pass image through gif demuxer it was necessary
to use -f gif option.
This change affected 'make fate' test results because previously
image2 demuxer and gif decoder took only first frame of multiframe
test data, which is no longer true with gif demuxer.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
 2012-11-30 14:35:11 +00:00
Vitaliy E Sugrobov
5603b2bf6e Gif demuxer 
Gif demuxer is capable of extracting multiple frames from gif file.
In conjunction with gif decoder it implements support for reading
animated gifs.
Demuxer has two options available to user: default_delay and min_delay.
These options are for protection from too rapid gif animations. In practice
it is standard approach to slow down rendering of this kind of gifs. If you try to
play gif with delay between frames of one hundredth of second (100fps) using
one of major web browsers, you get significantly slower playback,
around 10 fps. This is because browser detects that delay value is less than some
threshold (usually 2 hundredths of second) and reset it to default value (usually 10
hundredths of second, which corresponds to 10fps). Manipulating these options user
can achieve the same effect during conversion to some video format. Otherwise user
can set them to not protect from rapid animations at all.
The other case when these options necessary is for gif images encoded according to
gif87a standard since prior to gif89a there was no delay information included in file.
Bump lavf minor version.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
 2012-11-30 14:33:58 +00:00
Michael Niedermayer
db29a7c7c2 Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320' 
* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
  build: The FLAC encoder also depends on the flacdsp code
  img2: K&R formatting cosmetics
  h264: check context state before decoding slice data partitions
  flashsv: make sure data for zlib priming is available

Conflicts:
	libavcodec/Makefile
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-30 14:49:13 +01:00
Paul B Mahol
1560c3295d iff: fix some incorrect interpretations of invalid files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-30 10:44:00 +00:00
Paul B Mahol
50b5c2296a iff: MAUD support 
Based on patch by Piotr Bandurski
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-30 10:34:55 +00:00
Carl Eugen Hoyos
ccf771cd79 Correctly skip strf tag for subtitles when decoding avi. 
Fixes ticket #1797.
 2012-11-30 10:18:37 +01:00
Michael Niedermayer
10416a4d56 id3v2: check index against buffer size. Fix out of array access 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 23:12:42 +01:00
Paul B Mahol
9a31997938 BRSTM demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-29 19:04:35 +00:00
Diego Biurrun
cc7d5cfeec img2: K&R formatting cosmetics 
Also introduce local img_ namespace to simplify debugging.
 2012-11-29 17:15:57 +01:00
Michael Niedermayer
9f8e2e92ae Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 
* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
  fate: h264: Add dependencies
  fate: ea: Add dependencies
  fate: Do not unconditionally run libavutil tests
  rtpenc_chain: Remove unused variable
  nuv: check for malloc failure when allocating extradata
  nuv: use the stream indices generated by avformat_new_stream()

Conflicts:
	tests/fate/ea.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:16:46 +01:00
Michael Niedermayer
52066bdb30 Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b' 
* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
  nuv: cosmetics: pretty-printing

Conflicts:
	libavformat/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:07:51 +01:00
Michael Niedermayer
d7b20bfbb5 Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' 
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:00:44 +01:00
Michael Niedermayer
076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:45:57 +01:00
Daniel Verkamp
a0958949eb Vivo demuxer 2012-11-28 20:13:05 +00:00
Diego Biurrun
2c4593dd13 rtpenc_chain: Remove unused variable 2012-11-28 18:17:49 +01:00
Justin Ruggles
c74f81786d nuv: cosmetics: pretty-printing 2012-11-28 11:18:50 -05:00
Justin Ruggles
5c7bf2ddde lavf: move nuv fourcc audio tags from riff to nuv 2012-11-28 11:18:50 -05:00
Justin Ruggles
ab87d9b667 nuv: check for malloc failure when allocating extradata 
Also make sure extradata is freed in the case where multiple
NUV_EXTRADATA frame types are found. This may not happen in practice,
but it could happen in a malformed stream, which would lead to a memleak
if not handled.
 2012-11-28 11:18:50 -05:00
Justin Ruggles
261e9348ef lavf: add a common function for selecting a pcm codec from parameters 2012-11-28 11:18:50 -05:00
Justin Ruggles
838ed296df nuv: use the stream indices generated by avformat_new_stream() 2012-11-28 11:18:50 -05:00
Justin Ruggles
bfe5454cd2 lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h 2012-11-28 11:18:49 -05:00
Justin Ruggles
cdaa1f84fb lavf: move "MP3 " fourcc from riff to nut 
Original commit, 7b24f9b, says it was added because it is used in libnut.
 2012-11-28 11:18:49 -05:00
Paul B Mahol
01eed8c607 iff demuxer: 16SV support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 15:55:14 +00:00
Paul B Mahol
23101ceaa2 avrdec: implement seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 13:03:48 +00:00
Paul B Mahol
b0d9b011c7 avrdec: sample rate takes 3 bytes not 4 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 11:02:22 +00:00
Paul B Mahol
1793128cf7 avrdec: fix typo in .long_name 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 10:56:59 +00:00
Michael Niedermayer
2754dbb6e1 nut: put nut PCM audio tags in front of avi tags. 
This fixes correctly storing and identifying PCM in nut.

Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 02:03:56 +01:00
Michael Niedermayer
577b39aea2 Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8' 
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
	libavcodec/dcadec.c
	libavcodec/h264.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:31:04 +01:00
Michael Niedermayer
b4d4e51027 Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:10:05 +01:00
Michael Niedermayer
257196209f file: fix 10l error in access() check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 13:24:00 +01:00
Paul B Mahol
51d6879939 AFC demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 10:17:28 +00:00
Paul B Mahol
10c8f91341 astdec: improve probing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 10:16:30 +00:00
Michael Niedermayer
8aa6d899c0 cafdec: fix seeking with adpcm 
Fixes Ticket1906

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 05:03:24 +01:00
Michael Niedermayer
16ef48c37f file: Fallback to stat() based file_check() when access() or its named flags are unavailable. 
Should fix compilation on native windows
We could also use _access() and literal numbers as flags but i cant test it
and the compilation failure should be fixed ASAP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 05:03:24 +01:00
Michael Niedermayer
407921072f file: fix file_check() 
Fixes Ticket1904

This should work on windows, but if not please contact me ASAP
i have another idea on how to solve this without access() if that
really doesnt work on windows.

Strongly based on patch by divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 03:53:53 +01:00
Michael Niedermayer
2fe0094e0b wavenc: write fact chunk sample count at the correct file position 
Fixes curruption of metadata in the INFO chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-26 19:11:10 -05:00
Justin Ruggles
3c370f5abc riff: only warn on a bad INFO chunk code size instead of failing 
fixes Bug 392
 2012-11-26 19:08:51 -05:00
Justin Ruggles
259d8c5647 riff: do not add empty metadata tags in INFO chunk 2012-11-26 19:08:51 -05:00
Michael Niedermayer
386fc67c79 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:24:23 +01:00
Peter Ross
76f60788e7 iff demuxer: don't bother checking bitmap compression type; iff decoder does this now 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Janne Grunau
7709ce029a lavf: avoid integer overflow in ff_compute_frame_duration() 
Scaling the denominator instead of the numerator if it is too large
loses precision. Fixes an assert caused by a negative frame duration in
the fuzzed sample nasa-8s2.ts_s202310.

CC: libav-stable@libav.org
 2012-11-26 10:26:08 +01:00
Michael Niedermayer
bf2f93cdbf Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:43:45 +01:00
Paul B Mahol
b491da18d1 yop: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-25 11:10:52 -05:00
Diego Biurrun
ddb009425c riff: Make ff_riff_tags static and move under appropriate #ifdef 
The table is not used outside the file.
 2012-11-25 13:32:10 +01:00
Michael Niedermayer
e6305f7631 mov: set flags to indicate that byte wise seeking is not supported. 
Fixes Ticket1831

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 01:19:33 +01:00
Nicolas George
ca4872e887 lavf/sbgdec: use proper constants for av_log(). 2012-11-24 23:56:52 +01:00
Carl Eugen Hoyos
d080292651 Support u8 in aiff. 
Fixes ticket #1960.
Reviewed-by; Paul B Mahol
 2012-11-24 21:21:50 +01:00
Piotr Bandurski
081bf60ec6 c93: signal EOF 2012-11-24 15:04:32 +00:00
Paul B Mahol
05b02e9c0f mmf: simplify code by using FFMIN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:27:55 +00:00
Paul B Mahol
7f321fca23 mmf: signal EOF 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:24:13 +00:00
Paul B Mahol
9378a90add omadec: remove stale comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:41:43 +00:00
Paul B Mahol
3d8e684f05 ADPCM IMA Dialogic decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:56:47 +00:00
Paul B Mahol
1a61c7a54b wvenc: multichannel muxing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:20:46 +00:00
Paul B Mahol
1b9467aea1 omaenc: remove superfluous "OMA: " 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Paul B Mahol
bc5ba1c7fd omaenc: abort for unsupported codecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Piotr Bandurski
6d6bf250dd riff: fix decoding of 24-bit packed int (type 1, 20-bit) 2012-11-24 10:54:38 +01:00
Carl Eugen Hoyos
95903e3cfd Support G.722 in Sun AU. 2012-11-24 10:43:32 +01:00
Carl Eugen Hoyos
df651cf42e Add an annotation field as required by the specification when muxing Sun AU. 
Reviewed-by: Paul B Mahol
 2012-11-24 10:43:11 +01:00
Michael Niedermayer
09456d0df1 riff: ignore ff_read_riff_info() failure. 
Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 23:41:57 +01:00
Michael Niedermayer
0efcf16a3e replace av_log(0, by av_log(NULL, 
The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 18:10:02 +01:00
Michael Niedermayer
e9c372362c id3v2: restructure compressed and unsync code 
This should fix the interaction between the 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 03:28:20 +01:00
Michael Niedermayer
3616afced6 rmdec: fix av_log level and context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 01:19:48 +01:00
Michael Niedermayer
be89693ddc avidec: try to support oddly muxed MMES stream 
Fixes ticket1804

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 23:20:35 +01:00
Paul B Mahol
6aa6baa4f2 xmv: signal EOF 
Fixes #1946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-22 20:37:24 +00:00
Michael Niedermayer
66b45d8f7a movenc: fix assert failure caused by rounding. 
Fixes Ticket1820

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 20:58:06 +01:00
Paul B Mahol
32cd3a7c16 ADPCM AFC decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-22 19:27:44 +00:00
Michael Niedermayer
08e26e7f5c id3v2: print ver/flags/len on debug level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 19:31:04 +01:00
Michael Niedermayer
a9cfbf6d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 15:36:50 +01:00
Anton Khirnov
9ae80e6a9c id3v2: fix reading unsynchronized frames. 
Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.

Fixes Bug 395.

CC: libav-stable@libav.org
 2012-11-22 13:40:04 +01:00
Aleksi Nurmi
492a5f835c brender_pix: a new image decoder 
PIX is an image file format that was used by the BRender 3d engine.

Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:06:25 +01:00
Peter Ross
bdba96e93c use correct doxygen parameter direction syntax 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:56:15 +01:00
Peter Ross
9ccc349f77 ensure comment blocks that contain doxygen commands start with double asterix 
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:55:15 +01:00
Piotr Bandurski
88161b2a52 siff: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:52:20 +01:00
Piotr Bandurski
9530439e5f segafilm: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:51:21 +01:00
Piotr Bandurski
1ed7ca00dc bethsoftvid: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Piotr Bandurski
425d0888c3 bfi: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Paul B Mahol
8e6957964e yop: fix 10l typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 20:15:02 +00:00