RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,096 Commits 36 Branches 392 Tags 304 MiB
Commit Graph

11699 Commits

Author SHA1 Message Date
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
Peter Ross 0705cbd002 bink: return AVERROR_EOF upon reaching end of file 
Fixes ticket #1935.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 19:25:20 +01:00
Paul B Mahol e4e7846db8 cdxl: use url_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 16:39:44 +00:00
Paul B Mahol 168a7f06de rawenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 15:34:45 +00:00
Xi Wang b655cfefaf apetag: fix error handling in ff_ape_parse_tag() 
The following error handling is broken due to signedness.

    int file_size;
    uint32_t tag_bytes;
    int64_t tag_start;
    ...
    tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES;
    if (tag_start < 0) { ... }

Note that tag_bytes is unsigned, which makes the right-hand side of
`tag_start = ...' unsigned, too.  The 32-bit unsigned value is then
zero-extended to 64 bits.  Therefore, tag_start must be non-negative,
and the check (tag_start < 0) is always false, which breaks the error
handling.  This patch fixes the check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-21 14:35:26 +01:00
Piotr Bandurski 4bf3bc6f96 sierravmd: signal EOF 2012-11-21 10:38:52 +00:00
Paul B Mahol e94f429474 cafdec: return right code if EOF is reached 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 10:34:38 +00:00
Piotr Bandurski 25d8ebd422 thp: signal EOF 2012-11-21 10:21:54 +00:00
Piotr Bandurski 9a0ecd507a rpl: return AVERROR_EOF instead of -1 2012-11-21 09:48:46 +00:00
Clément Bœsch 030db0c1dd lavf/hls: whitespace cosmetics after 23db5418. 2012-11-21 08:01:51 +01:00
Clément Bœsch 57d7e21c34 lavf: move libmodplug registration with the other ext lib. 
Also remove the duplicated #if.
 2012-11-21 08:00:35 +01:00
LYF 23db5418ed hls: create an AVProgram for each variant 
Without the information, application may choose audio from one variant
and video from another variant, which leads to fetch two variants from
network. This enables av_find_best_stream() to find matching audio and
video streams, so that only one variant is fetched from network.

Signed-off-by: LYF <yefei.li@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 01:24:01 +01:00
Stefano Sabatini 8b6aeb1fcd lavf/segment: fix value for the M3U8 EXT-X-MEDIA 
From the M3U8 specification:
|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first
|URI that appears in a Playlist file.

Previously it was using the list index number. Also remove now unused
list_count field.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini 5a1ac463e0 lavf/segment: do not pre-increment segment_idx value 
Increment the value just when a new segment with the given index is
started. Simplify logic, improve readability.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini 2b31aa8895 lavf/segment: unbreak behavior for segment muxer 
The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should
be use in case of formats which requires no global headers.

Regression introduced when merging
0826d8513d.
 2012-11-20 22:48:28 +01:00