ffmpeg.git
6 years agox86/mpegvideoenc_template: use av_assert
Michael Niedermayer [Fri, 23 Nov 2012 16:57:22 +0000 (17:57 +0100)]
x86/mpegvideoenc_template: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomotion_est: use av_assert* instead of assert
Michael Niedermayer [Fri, 23 Nov 2012 15:40:53 +0000 (16:40 +0100)]
motion_est: use av_assert* instead of assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh263dec: switch 2 asserts to av_assert
Michael Niedermayer [Fri, 23 Nov 2012 15:36:17 +0000 (16:36 +0100)]
h263dec: switch 2 asserts to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodv: use av_assert
Michael Niedermayer [Fri, 23 Nov 2012 14:52:12 +0000 (15:52 +0100)]
dv: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sort cpuflags section by architecture

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '457cc333b424994ecf80a82369325771e0397fd9'
Michael Niedermayer [Fri, 23 Nov 2012 12:53:47 +0000 (13:53 +0100)]
Merge commit '457cc333b424994ecf80a82369325771e0397fd9'

* commit '457cc333b424994ecf80a82369325771e0397fd9':
  configure: properly support DEC/Compaq compiler

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
Michael Niedermayer [Fri, 23 Nov 2012 12:30:51 +0000 (13:30 +0100)]
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
Makefile
libavutil/mem.c
library.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: sort cpuflags section by architecture
Mans Rullgard [Sun, 18 Nov 2012 15:22:04 +0000 (15:22 +0000)]
configure: sort cpuflags section by architecture

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: properly support DEC/Compaq compiler
Mans Rullgard [Mon, 22 Oct 2012 23:05:44 +0000 (00:05 +0100)]
configure: properly support DEC/Compaq compiler

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoav_memcpy_backptr: optimise some special cases
Mans Rullgard [Fri, 26 Oct 2012 13:42:23 +0000 (14:42 +0100)]
av_memcpy_backptr: optimise some special cases

- Add special cases for offsets of 2, 3, or 4 bytes.  This means the
  offset is always >4 in the generic case, allowing 32-bit copies to
  be used there.
- Don't use memcpy() for sizes less than 16 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agompegvideo: simplify dxy calculation in hpel_motion()
Mans Rullgard [Sat, 4 Aug 2012 01:57:53 +0000 (02:57 +0100)]
mpegvideo: simplify dxy calculation in hpel_motion()

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobuild: add rules to generate preprocessed source files
Mans Rullgard [Wed, 3 Oct 2012 12:48:27 +0000 (13:48 +0100)]
build: add rules to generate preprocessed source files

This is useful for debugging.  Dependencies for these files are not
generated due to limitations in many compilers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoid3v2: restructure compressed and unsync code
Michael Niedermayer [Fri, 23 Nov 2012 02:28:20 +0000 (03:28 +0100)]
id3v2: restructure compressed and unsync code

This should fix the interaction between the 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1dec: remove incorrect assert()
Michael Niedermayer [Fri, 23 Nov 2012 00:33:12 +0000 (01:33 +0100)]
ffv1dec: remove incorrect assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: fix av_log level and context
Michael Niedermayer [Fri, 23 Nov 2012 00:19:48 +0000 (01:19 +0100)]
rmdec: fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: Fix av_log level and context
Michael Niedermayer [Fri, 23 Nov 2012 00:19:26 +0000 (01:19 +0100)]
truemotion2: Fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12: fix av_log level and context
Michael Niedermayer [Fri, 23 Nov 2012 00:18:53 +0000 (01:18 +0100)]
mpeg12: fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: fix av_log level
Michael Niedermayer [Fri, 23 Nov 2012 00:18:31 +0000 (01:18 +0100)]
dcadec: fix av_log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: try to support oddly muxed MMES stream
Michael Niedermayer [Thu, 22 Nov 2012 22:08:01 +0000 (23:08 +0100)]
avidec: try to support oddly muxed MMES stream

Fixes ticket1804

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovqavideo: Reinitialise the actually used partial codebook bytestream-reader.
Carl Eugen Hoyos [Thu, 22 Nov 2012 21:28:17 +0000 (22:28 +0100)]
vqavideo: Reinitialise the actually used partial codebook bytestream-reader.

Fixes ticket #1942.

6 years agoxmv: signal EOF
Paul B Mahol [Thu, 22 Nov 2012 20:37:24 +0000 (20:37 +0000)]
xmv: signal EOF

Fixes #1946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomovenc: fix assert failure caused by rounding.
Michael Niedermayer [Thu, 22 Nov 2012 19:38:51 +0000 (20:38 +0100)]
movenc: fix assert failure caused by rounding.

Fixes Ticket1820

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoADPCM AFC decoder
Paul B Mahol [Mon, 19 Nov 2012 10:51:44 +0000 (10:51 +0000)]
ADPCM AFC decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoid3v2: print ver/flags/len on debug level.
Michael Niedermayer [Thu, 22 Nov 2012 18:29:08 +0000 (19:29 +0100)]
id3v2: print ver/flags/len on debug level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests: prefer ffprobe -show_entries to -show_format_entry
Stefano Sabatini [Mon, 19 Nov 2012 23:21:23 +0000 (00:21 +0100)]
tests: prefer ffprobe -show_entries to -show_format_entry

The latter option was deprecated.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 22 Nov 2012 14:36:50 +0000 (15:36 +0100)]
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>
6 years agoffprobe: implement -sections option
Stefano Sabatini [Mon, 19 Nov 2012 23:08:48 +0000 (00:08 +0100)]
ffprobe: implement -sections option

6 years agoffprobe: implement subsection field selection through the -show_entries option
Stefano Sabatini [Mon, 17 Sep 2012 19:08:09 +0000 (21:08 +0200)]
ffprobe: implement subsection field selection through the -show_entries option

6 years agoid3v2: fix reading unsynchronized frames.
Anton Khirnov [Wed, 21 Nov 2012 07:48:47 +0000 (08:48 +0100)]
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
6 years agolavfi/avfiltergraph: improve error message in graph_check_validity()
Stefano Sabatini [Wed, 21 Nov 2012 20:27:02 +0000 (21:27 +0100)]
lavfi/avfiltergraph: improve error message in graph_check_validity()

Fix trac ticket #1944.

6 years agolavfi/drawtext: add support for printing frame numbers
Stefano Sabatini [Thu, 22 Nov 2012 11:08:45 +0000 (12:08 +0100)]
lavfi/drawtext: add support for printing frame numbers

Fix trac ticket #1949.

6 years agoffmpeg: add setting of field_order flag
Tim Nicholson [Fri, 2 Nov 2012 13:09:48 +0000 (13:09 +0000)]
ffmpeg: add setting of field_order flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofrwu: do not set interlacing flags.
Michael Niedermayer [Thu, 22 Nov 2012 04:15:57 +0000 (05:15 +0100)]
frwu: do not set interlacing flags.

Our fate frwu sample is definitely not interlaced.
If someone has a interlaced frwu file, please contact us.

Without this change the field order patch would cause
incorrect interlacing information to be written when
using frwu input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobrender: move declaration out of for() to make old compilers happy.
Michael Niedermayer [Thu, 22 Nov 2012 00:07:16 +0000 (01:07 +0100)]
brender: move declaration out of for() to make old compilers happy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobrender_pix: a new image decoder
Aleksi Nurmi [Thu, 15 Nov 2012 19:48:02 +0000 (21:48 +0200)]
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>
6 years agoFix the path to the C99-to-C89 Converter & Wrapper to the only existing repository.
Carl Eugen Hoyos [Wed, 21 Nov 2012 23:46:14 +0000 (00:46 +0100)]
Fix the path to the C99-to-C89 Converter & Wrapper to the only existing repository.

Ronald deleted his public c99-to-c89 repository today.

6 years agoffmpeg: fix weird reindent
Stefano Sabatini [Wed, 21 Nov 2012 23:12:18 +0000 (00:12 +0100)]
ffmpeg: fix weird reindent

6 years agoffmpeg: print debug_ts off and off_time values with timestamp helper routines
Stefano Sabatini [Wed, 21 Nov 2012 22:19:32 +0000 (23:19 +0100)]
ffmpeg: print debug_ts off and off_time values with timestamp helper routines

6 years agomips: Fixing HAVE_MIPSFPU dependencies
Bojan Zivkovic [Wed, 21 Nov 2012 13:00:28 +0000 (14:00 +0100)]
mips: Fixing HAVE_MIPSFPU dependencies

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agouse correct doxygen parameter direction syntax
Peter Ross [Wed, 21 Nov 2012 08:54:15 +0000 (19:54 +1100)]
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>
6 years agoensure comment blocks that contain doxygen commands start with double asterix
Peter Ross [Wed, 21 Nov 2012 08:53:08 +0000 (19:53 +1100)]
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>
6 years agosiff: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 16:28:44 +0000 (17:28 +0100)]
siff: signal EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosegafilm: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 16:13:49 +0000 (17:13 +0100)]
segafilm: signal EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobethsoftvid: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 16:04:22 +0000 (17:04 +0100)]
bethsoftvid: signal EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobfi: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 15:57:50 +0000 (16:57 +0100)]
bfi: signal EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyop: fix 10l typo
Paul B Mahol [Wed, 21 Nov 2012 20:15:02 +0000 (20:15 +0000)]
yop: fix 10l typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimgconvert-test: count the number of unused pixel format values.
Michael Niedermayer [Wed, 21 Nov 2012 19:13:45 +0000 (20:13 +0100)]
imgconvert-test: count the number of unused pixel format values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert-test: skip pix formats without name
Michael Niedermayer [Wed, 21 Nov 2012 19:08:53 +0000 (20:08 +0100)]
imgconvert-test: skip pix formats without name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: fix typo in a comment
Stefano Sabatini [Wed, 21 Nov 2012 12:17:21 +0000 (13:17 +0100)]
ffprobe: fix typo in a comment

6 years agoffprobe: add "," at the end of enum list
Stefano Sabatini [Wed, 21 Nov 2012 12:16:42 +0000 (13:16 +0100)]
ffprobe: add "," at the end of enum list

6 years agoimgconvert-test: test alpha flags
Michael Niedermayer [Wed, 21 Nov 2012 18:59:34 +0000 (19:59 +0100)]
imgconvert-test: test alpha flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixdesc: fix alpha flags
Michael Niedermayer [Wed, 21 Nov 2012 18:59:09 +0000 (19:59 +0100)]
pixdesc: fix alpha flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: remove avg_bits_per_pixel(), its redundant
Michael Niedermayer [Wed, 21 Nov 2012 18:49:53 +0000 (19:49 +0100)]
imgconvert: remove avg_bits_per_pixel(), its redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobink: return AVERROR_EOF upon reaching end of file
Peter Ross [Wed, 21 Nov 2012 08:55:01 +0000 (19:55 +1100)]
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>
6 years agocodec_descriptors: fix typo in mpeg 2 video
Michael Niedermayer [Wed, 21 Nov 2012 17:25:01 +0000 (18:25 +0100)]
codec_descriptors: fix typo in mpeg 2 video

Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 21 Nov 2012 17:12:13 +0000 (18:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flashsv: Drop unused function and struct parameters
  pcm: fix decoding of pcm_s16le_planar on big-endian

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'
Michael Niedermayer [Wed, 21 Nov 2012 17:00:56 +0000 (18:00 +0100)]
Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'

* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries.
Michael Niedermayer [Wed, 21 Nov 2012 16:37:32 +0000 (17:37 +0100)]
imgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_get_pix_fmt_loss: remove PixFmtInfo use
Michael Niedermayer [Wed, 21 Nov 2012 16:22:25 +0000 (17:22 +0100)]
avcodec_get_pix_fmt_loss: remove PixFmtInfo use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: print color type too
Michael Niedermayer [Wed, 21 Nov 2012 16:32:21 +0000 (17:32 +0100)]
imgconvert: print color type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocdxl: use url_feof()
Paul B Mahol [Wed, 21 Nov 2012 16:36:05 +0000 (16:36 +0000)]
cdxl: use url_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimgconvert: remove PixFmtInfo use from avg_bits_per_pixel()
Michael Niedermayer [Wed, 21 Nov 2012 15:47:02 +0000 (16:47 +0100)]
imgconvert: remove PixFmtInfo use from avg_bits_per_pixel()

This fixes several inconsistencies with YUV >8bit formats caused
due to missing information in the PixFmtInfo table.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not...
Michael Niedermayer [Wed, 21 Nov 2012 15:59:37 +0000 (16:59 +0100)]
avcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not incur a loss.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixdesc: add av_get_padded_bits_per_pixel()
Michael Niedermayer [Wed, 21 Nov 2012 15:45:54 +0000 (16:45 +0100)]
pixdesc: add av_get_padded_bits_per_pixel()

This will be needed to allow removing the PixFmtInfo table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert-test: add avg bits per pixel
Michael Niedermayer [Wed, 21 Nov 2012 15:14:25 +0000 (16:14 +0100)]
imgconvert-test: add avg bits per pixel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agois_yuv_planar: remove use of PixFmtInfo
Michael Niedermayer [Wed, 21 Nov 2012 15:11:01 +0000 (16:11 +0100)]
is_yuv_planar: remove use of PixFmtInfo

This fixes the behavior for a few yuva 16bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: add self test code
Michael Niedermayer [Wed, 21 Nov 2012 15:10:42 +0000 (16:10 +0100)]
imgconvert: add self test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawenc: cosmetics: reindent
Paul B Mahol [Wed, 21 Nov 2012 15:34:45 +0000 (15:34 +0000)]
rawenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
Michael Niedermayer [Wed, 21 Nov 2012 14:14:32 +0000 (15:14 +0100)]
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocdgraphics: fix incorrect vertical offset mask in cdg_scroll()
Xi Wang [Wed, 14 Nov 2012 08:42:37 +0000 (03:42 -0500)]
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()

The vertical offset mask 0x07 is suspicious.

    v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1);

Note that v_off is up to 11 (CDG_BORDER_HEIGHT - 1), the correct mask
should be 0x0F.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoapetag: fix error handling in ff_ape_parse_tag()
Xi Wang [Wed, 14 Nov 2012 08:25:41 +0000 (03:25 -0500)]
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>
6 years agoflashsv: Drop unused function and struct parameters
Diego Biurrun [Wed, 24 Oct 2012 17:14:24 +0000 (19:14 +0200)]
flashsv: Drop unused function and struct parameters

6 years agosierravmd: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 10:38:52 +0000 (10:38 +0000)]
sierravmd: signal EOF

6 years agocafdec: return right code if EOF is reached
Paul B Mahol [Tue, 20 Nov 2012 11:43:37 +0000 (11:43 +0000)]
cafdec: return right code if EOF is reached

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agothp: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 10:21:54 +0000 (10:21 +0000)]
thp: signal EOF

6 years agorpl: return AVERROR_EOF instead of -1
Piotr Bandurski [Wed, 21 Nov 2012 09:48:46 +0000 (09:48 +0000)]
rpl: return AVERROR_EOF instead of -1

6 years agolavf/hls: whitespace cosmetics after 23db5418.
Clément Bœsch [Wed, 21 Nov 2012 07:01:51 +0000 (08:01 +0100)]
lavf/hls: whitespace cosmetics after 23db5418.

6 years agolavf: move libmodplug registration with the other ext lib.
Clément Bœsch [Wed, 21 Nov 2012 07:00:35 +0000 (08:00 +0100)]
lavf: move libmodplug registration with the other ext lib.

Also remove the duplicated #if.

6 years agohls: create an AVProgram for each variant
LYF [Fri, 16 Nov 2012 06:12:27 +0000 (14:12 +0800)]
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>
6 years agolavf/segment: fix value for the M3U8 EXT-X-MEDIA
Stefano Sabatini [Sat, 17 Nov 2012 16:21:43 +0000 (17:21 +0100)]
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.

6 years agolavf/segment: do not pre-increment segment_idx value
Stefano Sabatini [Sat, 17 Nov 2012 16:20:29 +0000 (17:20 +0100)]
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.

6 years agolavf/segment: unbreak behavior for segment muxer
Stefano Sabatini [Sat, 17 Nov 2012 16:12:43 +0000 (17:12 +0100)]
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
0826d8513d14f54da0b519360813327d5836b7fc.

6 years agolavf/segment: consistently use "seg" in segment_start()
Stefano Sabatini [Sat, 17 Nov 2012 15:35:51 +0000 (16:35 +0100)]
lavf/segment: consistently use "seg" in segment_start()

6 years agoffmpeg: rework debugging timestamp logs in process_input()
Stefano Sabatini [Sat, 17 Nov 2012 10:12:04 +0000 (11:12 +0100)]
ffmpeg: rework debugging timestamp logs in process_input()

Print timestamps before and after ffmpeg timestamp postprocessing.
Help to debug how ffmpeg processes the input timestamps.

6 years agolavf/srtdec: trim line break event separators from packet.
Clément Bœsch [Sat, 10 Nov 2012 23:06:58 +0000 (00:06 +0100)]
lavf/srtdec: trim line break event separators from packet.

The muxer add them automatically, so this avoid having a bunch of line
breaks all over the output files. One '\n' is still kept/added because
the lavc subrip decoder seems to have trouble with line ending abruptly
(it doesn't flush correctly the tags). This bug is harmless but should
be fixed; though, this doesn't look like a trivial change. When this bug
gets fixed, we can consider removing the '\n' at the end of the packet.

The 2048B buffer limit was also removed while moving to AVBPrint API.
Note that this doesn't really matter since the decoder is limited as
well.

6 years agoAdd -skip_initial_bytes option.
Carl Eugen Hoyos [Tue, 20 Nov 2012 21:04:14 +0000 (22:04 +0100)]
Add -skip_initial_bytes option.

Fixes ticket #1909.

6 years agoCorrectly signal EOF when demuxing caf files.
Carl Eugen Hoyos [Tue, 20 Nov 2012 21:04:03 +0000 (22:04 +0100)]
Correctly signal EOF when demuxing caf files.

6 years agoswr: include stdint.h instead of inttypes.h.
Clément Bœsch [Tue, 20 Nov 2012 20:51:25 +0000 (21:51 +0100)]
swr: include stdint.h instead of inttypes.h.

stdint.h is for the [u]int*_t types, which is the only thing we need for
the prototypes. inttypes.h includes stdint.h and defines more thing we
don't need here.

Bump micro in case a user app was relying on this include for its own
code.

6 years agorc: fix 10l typo in rc_max_available_vbv_use calculation
Michael Niedermayer [Tue, 20 Nov 2012 19:47:38 +0000 (20:47 +0100)]
rc: fix 10l typo in  rc_max_available_vbv_use calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: increase pcm coverage
Paul B Mahol [Tue, 20 Nov 2012 18:13:25 +0000 (18:13 +0000)]
fate: increase pcm coverage

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswr: fix a few typo in the public header.
Clément Bœsch [Tue, 20 Nov 2012 19:29:05 +0000 (20:29 +0100)]
swr: fix a few typo in the public header.

6 years agoswr-doxy: elaborate on swr_get_delay() and the timebase
Michael Niedermayer [Tue, 20 Nov 2012 19:05:08 +0000 (20:05 +0100)]
swr-doxy: elaborate on swr_get_delay() and the timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: general doxy text about swr and example code.
Michael Niedermayer [Mon, 19 Nov 2012 22:46:34 +0000 (23:46 +0100)]
swr: general doxy text about swr and example code.

Based on doxy from avr
Reviewed-by: Clément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: do not copy codec_tag when not available
ChanMin Kim [Sat, 17 Nov 2012 16:39:51 +0000 (17:39 +0100)]
lavf/segment: do not copy codec_tag when not available

Some muxers do not allow stream if codec_tag is incompatible.

Sometimes the passed input codec's codec_tag is not compatible with the
output muxer.

Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c
doesn't know how to handle these cases.

Signed-off-by: ChanMin Kim <kcm1700@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agothe hyperlink to the Developer's Certificate of Origin no longer works; use Linux...
Peter Ross [Mon, 19 Nov 2012 23:15:53 +0000 (10:15 +1100)]
the hyperlink to the Developer's Certificate of Origin no longer works; use Linux kernel hyperlink

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoadd some planar PCM encoders
Paul B Mahol [Mon, 19 Nov 2012 09:19:30 +0000 (09:19 +0000)]
add some planar PCM encoders

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopcmdec: use memcpy() when possible for planar decoders
Paul B Mahol [Tue, 20 Nov 2012 16:51:46 +0000 (16:51 +0000)]
pcmdec: use memcpy() when possible for planar decoders

This is faster (at least with clang).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopcm: fix decoding of pcm_s16le_planar on big-endian
Justin Ruggles [Tue, 20 Nov 2012 05:57:41 +0000 (00:57 -0500)]
pcm: fix decoding of pcm_s16le_planar on big-endian

The sample count is decremented by the DECODE() macro and needs to be reset
in each loop iteration. Also, DECODE() increments the src pointer so that does
not need to be done separately.

6 years agooggdec: fix memleak on header parsing failure
Michael Niedermayer [Tue, 20 Nov 2012 14:12:37 +0000 (15:12 +0100)]
oggdec: fix memleak on header parsing failure

Fixes Ticket1931

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com
Stefano Sabatini [Tue, 20 Nov 2012 13:54:58 +0000 (14:54 +0100)]
doc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com

ffmpeg.arrozcru.org is currently unmaintained, and it redirects to
ffmpeg.zeranoe.com.