ffmpeg.git
8 years agomatroskadec: introduce resync function.
Reimar Döffinger [Mon, 13 Feb 2012 22:06:19 +0000 (23:06 +0100)]
matroskadec: introduce resync function.

This allows handling matroska files with errors.
Fixes test4.mkv and test7.mkv from the official Matroska test suite.
These are also trac issues #544 and #545.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoAdd ismv regression test.
Reimar Döffinger [Sun, 12 Feb 2012 11:06:36 +0000 (12:06 +0100)]
Add ismv regression test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomovenc: fix crashes if a stream is empty.
Reimar Döffinger [Sun, 12 Feb 2012 11:05:43 +0000 (12:05 +0100)]
movenc: fix crashes if a stream is empty.

For some reason this always happens with -f ismv.
See trac issue #996.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoprores: initialise encoder and decoder parts only when needed
Kostya Shishkov [Fri, 17 Feb 2012 08:46:53 +0000 (09:46 +0100)]
prores: initialise encoder and decoder parts only when needed

8 years agomovenc: leave st->codec->frame_size as is instead of forcing it to 1.
Andrew Wason [Fri, 17 Feb 2012 15:24:18 +0000 (16:24 +0100)]
movenc: leave st->codec->frame_size as is instead of forcing it to 1.

Muxing pcm audio in MOV using avcodec_encode_audio() was failing
because avcodec_encode_audio() returns an incorrect packet size of 4
bytes. This can be reproduced by modifying the sample
ffmpeg/doc/examples/muxing.c to encode PCM, see ML patch
muxing-test.diff

I git bisected and commit 89ddff92a385 is the one that broke this. In
mov_write_header() if st->codec->frame_size <= 1 it sets it to 1. Then
avcodec_encode_audio() sets frame->nb_samples = avctx->frame_size, and
frame->nb_samples of 1 is used to compute a packet size of 4 bytes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMakefile: fix proresdec dependancies
Zongyao Qu [Fri, 17 Feb 2012 05:04:31 +0000 (06:04 +0100)]
Makefile: fix proresdec dependancies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: add count_frames and count_packets options
Matthieu Bouron [Wed, 1 Feb 2012 15:23:53 +0000 (16:23 +0100)]
ffprobe: add count_frames and count_packets options

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 16 Feb 2012 23:35:06 +0000 (00:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  shorten: Use separate pointers for the allocated memory for decoded samples.
  atrac3: Fix crash in tonal component decoding.
  ws_snd1: Fix wrong samples counts.
  movenc: Don't set a default sample duration when creating ismv
  rtp: Factorize the check for distinguishing RTCP packets from RTP
  golomb: avoid infinite loop on all-zero input (or end of buffer).
  bethsoftvid: synchronize video timestamps with audio sample rate
  bethsoftvid: add audio stream only after getting the first audio packet
  bethsoftvid: Set video packet duration instead of accumulating pts.
  bethsoftvid: set packet key frame flag for audio and I-frame video packets.
  bethsoftvid: fix read_packet() return codes.
  bethsoftvid: pass palette in side data instead of in a separate packet.
  sdp: Ignore RTCP packets when autodetecting RTP streams
  proresenc: initialise 'sign' variable
  mpegaudio: replace memcpy by SIMD code
  vc1: prevent using last_frame as a reference for I/P first frame.

Conflicts:
libavcodec/atrac3.c
libavcodec/golomb.h
libavcodec/shorten.c
libavcodec/ws-snd1.c
tests/ref/fate/bethsoft-vid

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/overlay: add logic for avoiding overlaying frames with PTS > main frame PTS
Stefano Sabatini [Tue, 10 Jan 2012 00:21:17 +0000 (01:21 +0100)]
lavfi/overlay: add logic for avoiding overlaying frames with PTS > main frame PTS

Also add debug logging messages for helping tracking down similar
issues.

Fix trac ticket #467.

8 years agodshow_filter: fix compilation with mingw-w64
Rafaël Carré [Thu, 16 Feb 2012 22:15:59 +0000 (17:15 -0500)]
dshow_filter: fix compilation with mingw-w64

Closes ticket #999
NO_DSHOW_STRSAFE asks dshow.h header to not use secure string function
replacements.
Using secure replacements would break mingw.org compatibility as they don't
declare/define those functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agog729dec: fix 'warning: assignment from incompatible pointer type'
Michael Niedermayer [Thu, 16 Feb 2012 22:03:58 +0000 (23:03 +0100)]
g729dec: fix 'warning: assignment from incompatible pointer type'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agog729dec: fix use of deprecated functions.
Michael Niedermayer [Thu, 16 Feb 2012 22:02:07 +0000 (23:02 +0100)]
g729dec: fix use of deprecated functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: fix use of deprecated funnctions
Michael Niedermayer [Thu, 16 Feb 2012 22:01:47 +0000 (23:01 +0100)]
diracdec: fix use of deprecated funnctions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoshorten: Use separate pointers for the allocated memory for decoded samples.
Michael Niedermayer [Sun, 25 Dec 2011 11:28:50 +0000 (12:28 +0100)]
shorten: Use separate pointers for the allocated memory for decoded samples.

Fixes invalid free() if any of the buffers are not allocated due to either
not decoding a header or an error prior to allocating all buffers.

Fixes CVE-2012-0858
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoatrac3: Fix crash in tonal component decoding.
Michael Niedermayer [Sat, 17 Dec 2011 02:18:58 +0000 (03:18 +0100)]
atrac3: Fix crash in tonal component decoding.

Add a check to avoid writing past the end of the channel_unit.components[]
array.

Bug Found by: cosminamironesei
Fixes CVE-2012-0853
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agows_snd1: Fix wrong samples counts.
Michael Niedermayer [Sat, 24 Dec 2011 23:10:27 +0000 (00:10 +0100)]
ws_snd1: Fix wrong samples counts.

This makes the check that avoids overwrite of the samples array actually
work properly.

fixes CVE-2012-0848
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoqtrleenc: fix uninitialized variable warnings
Michael Niedermayer [Thu, 16 Feb 2012 19:11:33 +0000 (20:11 +0100)]
qtrleenc: fix uninitialized variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdec2: use ff_dsputil_init() avoid deprecated ff_ less variant.
Michael Niedermayer [Thu, 16 Feb 2012 18:55:16 +0000 (19:55 +0100)]
proresdec2: use ff_dsputil_init() avoid deprecated ff_ less variant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdec2: Fix 16 vs. 8bit compiler warnings.
Michael Niedermayer [Thu, 16 Feb 2012 18:54:28 +0000 (19:54 +0100)]
proresdec2: Fix 16 vs. 8bit compiler warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: Don't set a default sample duration when creating ismv
Martin Storsjö [Tue, 31 Jan 2012 13:23:26 +0000 (15:23 +0200)]
movenc: Don't set a default sample duration when creating ismv

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortp: Factorize the check for distinguishing RTCP packets from RTP
Martin Storsjö [Thu, 16 Feb 2012 16:31:03 +0000 (17:31 +0100)]
rtp: Factorize the check for distinguishing RTCP packets from RTP

The binary doesn't change after this patch.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agogolomb: avoid infinite loop on all-zero input (or end of buffer).
Ronald S. Bultje [Tue, 14 Feb 2012 19:50:57 +0000 (11:50 -0800)]
golomb: avoid infinite loop on all-zero input (or end of buffer).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agobethsoftvid: synchronize video timestamps with audio sample rate
Justin Ruggles [Thu, 19 Jan 2012 01:24:30 +0000 (20:24 -0500)]
bethsoftvid: synchronize video timestamps with audio sample rate

According to unofficial documentation, the video rate is locked to the audio
sample rate. This results in proper synchronization of audio and video
timestamps from the demuxer. This only works if the first audio packet occurs
before the first video packet or the audio sample rate is the default rate of
11111 Hz, both of which are true for all samples in our archive.

8 years agobethsoftvid: add audio stream only after getting the first audio packet
Justin Ruggles [Thu, 19 Jan 2012 00:50:37 +0000 (19:50 -0500)]
bethsoftvid: add audio stream only after getting the first audio packet

This avoids initializing a stream with dummy values or when the file does not
contain audio.
Also set duration for audio packets, using the sample rate as the time base.

8 years agobethsoftvid: Set video packet duration instead of accumulating pts.
Justin Ruggles [Wed, 18 Jan 2012 23:58:54 +0000 (18:58 -0500)]
bethsoftvid: Set video packet duration instead of accumulating pts.

8 years agobethsoftvid: set packet key frame flag for audio and I-frame video packets.
Justin Ruggles [Wed, 18 Jan 2012 23:48:32 +0000 (18:48 -0500)]
bethsoftvid: set packet key frame flag for audio and I-frame video packets.

Fixes avconv video stream copy of bethsoft video, which was skipping all
video frames unless the copyinkf option was used.

8 years agobethsoftvid: fix read_packet() return codes.
Justin Ruggles [Wed, 18 Jan 2012 23:46:38 +0000 (18:46 -0500)]
bethsoftvid: fix read_packet() return codes.

Use proper AVERROR codes, and return 0 for no error.

8 years agobethsoftvid: pass palette in side data instead of in a separate packet.
Justin Ruggles [Wed, 18 Jan 2012 20:45:47 +0000 (15:45 -0500)]
bethsoftvid: pass palette in side data instead of in a separate packet.

Update FATE reference to account for now non-existent palette packet.
This also fixes the FATE test if frame data is not initialized in
get_buffer(), so update comment in avconv accordingly.

8 years agosdp: Ignore RTCP packets when autodetecting RTP streams
Martin Storsjö [Mon, 13 Feb 2012 15:05:43 +0000 (17:05 +0200)]
sdp: Ignore RTCP packets when autodetecting RTP streams

The rtp demuxer which listens for RTP packets and detects the
RTP payload type will currently get confused if the first packet
received is an RTCP packet. Thus ignore such packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoproresenc: initialise 'sign' variable
Kostya Shishkov [Wed, 15 Feb 2012 19:52:11 +0000 (20:52 +0100)]
proresenc: initialise 'sign' variable

8 years agosnow: zero scratchbuf.
Michael Niedermayer [Thu, 16 Feb 2012 05:25:32 +0000 (06:25 +0100)]
snow: zero scratchbuf.

This should fix some valgrind warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: trying to fix "libavcodec/dct-test.o:(.rodata+0xdc): undefined reference to...
Michael Niedermayer [Thu, 16 Feb 2012 05:15:40 +0000 (06:15 +0100)]
fate: trying to fix "libavcodec/dct-test.o:(.rodata+0xdc): undefined reference to fdct_altivec"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegaudio: replace memcpy by SIMD code
Christophe GISQUET [Wed, 18 Jan 2012 21:34:29 +0000 (22:34 +0100)]
mpegaudio: replace memcpy by SIMD code

By replacing memcpy with an unrolled loop using the alignment knowledge
it has, some speedup can be obtained.

Before (gcc 4.6.1): ~400 cycles
After: ~370 cycles

Overall, around 2% speed increase when decoding a 2400s mp3 to f32le.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agovc1: prevent using last_frame as a reference for I/P first frame.
Ronald S. Bultje [Tue, 14 Feb 2012 20:40:19 +0000 (12:40 -0800)]
vc1: prevent using last_frame as a reference for I/P first frame.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Thu, 16 Feb 2012 03:01:24 +0000 (04:01 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Do not try to read residue if ave_mean <= 1
  Move some variable declarations to comply with C90
  Cosmetics: fix some whitespace errors
  Support 24-bit decoding
  wmall: remove ;;

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoHandle interlaced formats (two coding units together make one full frame)
Pilotware [Wed, 15 Feb 2012 05:35:06 +0000 (21:35 -0800)]
Handle interlaced formats (two coding units together make one full frame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 Feb 2012 23:49:16 +0000 (00:49 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresenc: Rename for incoming NIH-syndrom.
Michael Niedermayer [Wed, 15 Feb 2012 23:37:17 +0000 (00:37 +0100)]
proresenc: Rename for incoming NIH-syndrom.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDo not try to read residue if ave_mean <= 1
Mashiat Sarker Shakkhar [Wed, 15 Feb 2012 20:11:17 +0000 (02:11 +0600)]
Do not try to read residue if ave_mean <= 1

Otherwise, we end up with with log(0) or log(1). av_ceil_log2 simply
assumes the argument is non-zero and returns wrong result when it is.
(Not that there is a proper way of returning an undefined value.)

8 years agoMove some variable declarations to comply with C90
Mashiat Sarker Shakkhar [Thu, 19 Jan 2012 19:52:49 +0000 (01:52 +0600)]
Move some variable declarations to comply with C90

8 years agoCosmetics: fix some whitespace errors
Mashiat Sarker Shakkhar [Thu, 19 Jan 2012 19:52:14 +0000 (01:52 +0600)]
Cosmetics: fix some whitespace errors

8 years agoSupport 24-bit decoding
Mashiat Sarker Shakkhar [Sun, 22 Jan 2012 11:48:15 +0000 (17:48 +0600)]
Support 24-bit decoding

8 years agowmall: remove ;;
Michael Niedermayer [Tue, 3 Jan 2012 22:52:28 +0000 (23:52 +0100)]
wmall: remove ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoppc: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 12:42:56 +0000 (14:42 +0200)]
ppc: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agosh4: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 12:15:40 +0000 (14:15 +0200)]
sh4: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompegvideo: Add ff_ prefix to nonstatic functions
Martin Storsjö [Wed, 15 Feb 2012 12:10:33 +0000 (14:10 +0200)]
mpegvideo: Add ff_ prefix to nonstatic functions

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortjpeg: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:55:19 +0000 (13:55 +0200)]
rtjpeg: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agorv: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:54:05 +0000 (13:54 +0200)]
rv: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agovp56: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:51:57 +0000 (13:51 +0200)]
vp56: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agovorbis: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:46:40 +0000 (13:46 +0200)]
vorbis: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomsmpeg4: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:05:06 +0000 (13:05 +0200)]
msmpeg4: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agovc1: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 11:00:08 +0000 (13:00 +0200)]
vc1: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomsmpeg4: Add ff_ prefixes to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 10:56:41 +0000 (12:56 +0200)]
msmpeg4: Add ff_ prefixes to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agosnow: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 10:43:58 +0000 (12:43 +0200)]
snow: Add ff_ prefix to nonstatic symbols

This allows getting rid of a hack for conflicting symbol/define
names.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompeg12: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 10:38:52 +0000 (12:38 +0200)]
mpeg12: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompeg4: Add ff_ prefixes to nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 10:36:50 +0000 (12:36 +0200)]
mpeg4: Add ff_ prefixes to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolagarith: Add ff_ prefix to lag_rac_init
Martin Storsjö [Wed, 15 Feb 2012 10:30:15 +0000 (12:30 +0200)]
lagarith: Add ff_ prefix to lag_rac_init

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavcodec: Add ff_ prefix to j_rev_dct*
Martin Storsjö [Wed, 15 Feb 2012 10:29:24 +0000 (12:29 +0200)]
libavcodec: Add ff_ prefix to j_rev_dct*

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodsputil: Add ff_ prefix to inv_zigzag_direct16
Martin Storsjö [Wed, 15 Feb 2012 10:26:15 +0000 (12:26 +0200)]
dsputil: Add ff_ prefix to inv_zigzag_direct16

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavcodec: Prefix fdct_ifast, fdct_ifast248
Martin Storsjö [Wed, 15 Feb 2012 10:10:21 +0000 (12:10 +0200)]
libavcodec: Prefix fdct_ifast, fdct_ifast248

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodsputil: Add ff_ prefix to the dsputil*_init* functions
Martin Storsjö [Wed, 15 Feb 2012 10:06:44 +0000 (12:06 +0200)]
dsputil: Add ff_ prefix to the dsputil*_init* functions

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavcodec: Add ff_ prefix to some nonstatic symbols
Martin Storsjö [Wed, 15 Feb 2012 09:40:48 +0000 (11:40 +0200)]
libavcodec: Add ff_ prefix to some nonstatic symbols

Prefix the functions atrac_generate_tables, atrac_iqmf, dct_quantize_c.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agovlc/rl: Add ff_ prefix to the nonstatic symbols
Martin Storsjö [Thu, 9 Feb 2012 09:37:58 +0000 (11:37 +0200)]
vlc/rl: Add ff_ prefix to the nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoh263: Add ff_ prefix to nonstatic symbols
Martin Storsjö [Thu, 9 Feb 2012 09:28:46 +0000 (11:28 +0200)]
h263: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavformat: Add an ff_ prefix to some lavf internal symbols
Martin Storsjö [Wed, 15 Feb 2012 09:28:39 +0000 (11:28 +0200)]
libavformat: Add an ff_ prefix to some lavf internal symbols

Prefix the functions/tables brktimegm, pcm_read_seek,
dv_offset_reset, voc_get_packet, codec_movaudio_tags,
codec_movvideo_tags.

After this, lavf has no global symbols without the proper prefix.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompegvideo: Remove a leftover function declaration
Martin Storsjö [Wed, 15 Feb 2012 09:44:31 +0000 (11:44 +0200)]
mpegvideo: Remove a leftover function declaration

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Make rtsp_demuxer_class static
Martin Storsjö [Wed, 15 Feb 2012 09:37:35 +0000 (11:37 +0200)]
rtsp: Make rtsp_demuxer_class static

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoffmpeg: Fix image allocation.
Michael Niedermayer [Wed, 15 Feb 2012 19:31:57 +0000 (20:31 +0100)]
ffmpeg: Fix image allocation.

This probably fixes some of the use of uninitialized issues valgrind shows in fate.
It might also fix other issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: Warn the user if transparency is stored.
Michael Niedermayer [Wed, 15 Feb 2012 18:34:08 +0000 (19:34 +0100)]
ffv1: Warn the user if transparency is stored.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaf_pan: comment a tricky piece of code.
Nicolas George [Wed, 15 Feb 2012 18:41:41 +0000 (19:41 +0100)]
af_pan: comment a tricky piece of code.

8 years agopan: fix uninitialized channel_id variable.
Clément Bœsch [Tue, 14 Feb 2012 12:46:40 +0000 (13:46 +0100)]
pan: fix uninitialized channel_id variable.

Fix broken parsing with pan=2:FL=FR:FR=FL and similar.

8 years agoaudioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.
Clément Bœsch [Tue, 14 Feb 2012 11:07:31 +0000 (12:07 +0100)]
audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.

8 years agoprores encoder
Kostya Shishkov [Thu, 2 Feb 2012 19:54:53 +0000 (20:54 +0100)]
prores encoder

8 years agoprores: move data shared between decoder and encoder to common file
Kostya Shishkov [Sat, 10 Dec 2011 12:40:39 +0000 (13:40 +0100)]
prores: move data shared between decoder and encoder to common file

8 years agoprores: fix multithreaded decoding case when slice quantisers are not the same
Kostya Shishkov [Mon, 13 Feb 2012 18:27:48 +0000 (19:27 +0100)]
prores: fix multithreaded decoding case when slice quantisers are not the same

Since quantisation matrices are stored in context, decoding slices with
different quantisers in parallel leads to unpredictable content of
aforementioned matrices and wrong output picture thereof.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 Feb 2012 00:38:34 +0000 (01:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  CDXL demuxer and decoder
  hls: Re-add legacy applehttp name to preserve interface compatibility.
  hlsproto: Rename the functions and context
  hlsproto: Encourage users to try the hls demuxer instead of the proto
  doc: Move the hls protocol section into the right place
  libavformat: Rename the applehttp protocol to hls
  hls: Rename the functions and context
  libavformat: Rename the applehttp demuxer to hls
  rtpdec: Support H263 in RFC 2190 format
  rv30: check block type validity
  ttadec: CRC checking
  movenc: Support muxing VC1
  avconv: Don't split out inline sequence headers when stream copying VC1
  rv34: handle size changes during frame multithreading
  rv40: prevent undefined signed overflow in rv40_loop_filter()
  rv34: use AVERROR return values in ff_rv34_decode_frame()
  rv34: use uint16_t for RV34DecContext.deblock_coefs
  librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
  movenc: Use defines instead of hardcoded numbers for RTCP types
  smjpegdec: implement seeking
  ...

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/rv30.c
libavcodec/tta.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: enable some more SIMD functions.
Michael Niedermayer [Tue, 14 Feb 2012 23:20:24 +0000 (00:20 +0100)]
swscale: enable some more SIMD functions.

They no longer just segfault.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: PIX_FMT_GRAY8 support
Paul B Mahol [Tue, 14 Feb 2012 05:39:03 +0000 (05:39 +0000)]
ffv1: PIX_FMT_GRAY8 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/silencedetect: use av_ts2timestr() macro.
Clément Bœsch [Tue, 14 Feb 2012 23:21:14 +0000 (00:21 +0100)]
lavfi/silencedetect: use av_ts2timestr() macro.

8 years agoCDXL demuxer and decoder
Paul B Mahol [Tue, 14 Feb 2012 17:36:20 +0000 (17:36 +0000)]
CDXL demuxer and decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswscale: yuv2422_2_c_template() add cliping.
Michael Niedermayer [Tue, 14 Feb 2012 19:41:19 +0000 (20:41 +0100)]
swscale: yuv2422_2_c_template() add cliping.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Add cliping to yuv2422_1_c_template()
Michael Niedermayer [Tue, 14 Feb 2012 19:33:39 +0000 (20:33 +0100)]
swscale: Add cliping to yuv2422_1_c_template()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Fix rounding in yuv2mono_1_c_template()
Michael Niedermayer [Tue, 14 Feb 2012 18:34:17 +0000 (19:34 +0100)]
swscale: Fix rounding in yuv2mono_1_c_template()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Fix rounding in yuv2rgb_1_c_template()
Michael Niedermayer [Tue, 14 Feb 2012 17:44:34 +0000 (18:44 +0100)]
swscale: Fix rounding in yuv2rgb_1_c_template()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: yuv2422_1_c_template: fix rounding
Michael Niedermayer [Tue, 14 Feb 2012 17:33:14 +0000 (18:33 +0100)]
swscale: yuv2422_1_c_template: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohls: Re-add legacy applehttp name to preserve interface compatibility.
Alex Converse [Tue, 14 Feb 2012 19:17:00 +0000 (11:17 -0800)]
hls: Re-add legacy applehttp name to preserve interface compatibility.

8 years agohlsproto: Rename the functions and context
Martin Storsjö [Tue, 14 Feb 2012 10:16:31 +0000 (12:16 +0200)]
hlsproto: Rename the functions and context

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agohlsproto: Encourage users to try the hls demuxer instead of the proto
Martin Storsjö [Tue, 14 Feb 2012 10:09:09 +0000 (12:09 +0200)]
hlsproto: Encourage users to try the hls demuxer instead of the proto

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodoc: Move the hls protocol section into the right place
Martin Storsjö [Tue, 14 Feb 2012 10:04:50 +0000 (12:04 +0200)]
doc: Move the hls protocol section into the right place

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavformat: Rename the applehttp protocol to hls
Martin Storsjö [Tue, 14 Feb 2012 10:00:49 +0000 (12:00 +0200)]
libavformat: Rename the applehttp protocol to hls

Keep the old protocol name around for backwards compatibility
until the next bump.

Deprecate the method of implicitly assuming the nested protocol.
For applehttp://server/path, it might have felt logical, but
supporting hls://server/path isn't quite as intuitive. Therefore
only support hls+http://server/path from now on.

Using this protocol at all is discouraged, since the hls demuxer
is more complete and fits into the architecture better. There
have been cases where the protocol implementation worked better
than the demuxer, but this should no longer be the case.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agohls: Rename the functions and context
Martin Storsjö [Tue, 14 Feb 2012 09:50:51 +0000 (11:50 +0200)]
hls: Rename the functions and context

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavformat: Rename the applehttp demuxer to hls
Martin Storsjö [Tue, 14 Feb 2012 09:47:31 +0000 (11:47 +0200)]
libavformat: Rename the applehttp demuxer to hls

When this demuxer was created, there didn't seem to be any
consensus of a common short name for this protocol. Now
the consensus seems to be to call it hls.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec: Support H263 in RFC 2190 format
Martin Storsjö [Tue, 7 Feb 2012 14:15:26 +0000 (16:15 +0200)]
rtpdec: Support H263 in RFC 2190 format

This is different from the "modern" RTP payload formats for H263
as defined by RFC 4629, 2429 and 3555. According to the newer RFCs,
this old one is to be considered deprecated and only be used for
interoperating with legacy systems.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agorv30: check block type validity
Janne Grunau [Tue, 14 Feb 2012 14:02:30 +0000 (15:02 +0100)]
rv30: check block type validity

Prevents crashes with the fuzzed samples from bugs 88, 89 and 125 after
"golomb: avoid infinite loop on all-zero input".

8 years agottadec: CRC checking
Paul B Mahol [Sat, 11 Feb 2012 21:30:30 +0000 (21:30 +0000)]
ttadec: CRC checking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agolavfi/ashowinfo: only print checksum for the existing planes
Stefano Sabatini [Thu, 9 Feb 2012 22:59:16 +0000 (23:59 +0100)]
lavfi/ashowinfo: only print checksum for the existing planes

Make the output a bit nicer.

8 years agolavfi/showinfo: only print checksum for the existing planes
Stefano Sabatini [Thu, 9 Feb 2012 18:42:17 +0000 (19:42 +0100)]
lavfi/showinfo: only print checksum for the existing planes

Make the output a bit nicer.

8 years agolavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo
Stefano Sabatini [Thu, 9 Feb 2012 18:30:26 +0000 (19:30 +0100)]
lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo

8 years agoffmpeg.c: implement -debug_ts option
Stefano Sabatini [Fri, 20 Jan 2012 16:06:26 +0000 (17:06 +0100)]
ffmpeg.c: implement -debug_ts option

Mostly useful for debugging purposes.

8 years agomovenc: Support muxing VC1
Martin Storsjö [Sat, 21 Jan 2012 00:16:34 +0000 (02:16 +0200)]
movenc: Support muxing VC1

Signed-off-by: Martin Storsjö <martin@martin.st>