OSDN Git Service

android-x86/external-ffmpeg.git
12 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.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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.)

12 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

12 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

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

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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.

12 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.

12 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.

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

12 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

12 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.

12 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>
12 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>
12 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>
12 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.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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".

12 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>
12 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.

12 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.

12 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

12 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.

12 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>
12 years agoavconv: Don't split out inline sequence headers when stream copying VC1
Martin Storsjö [Mon, 23 Jan 2012 11:06:07 +0000 (13:06 +0200)]
avconv: Don't split out inline sequence headers when stream copying VC1

This is required when stream copying VC1 in ismv - there's one
global header in the moov atom, but keyframes have a separate
sequence header prepended.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agorv34: handle size changes during frame multithreading
Janne Grunau [Mon, 13 Feb 2012 20:10:48 +0000 (21:10 +0100)]
rv34: handle size changes during frame multithreading

Factors all context dynamic memory handling to its own functions.
Fixes bug 220.

12 years agorv40: prevent undefined signed overflow in rv40_loop_filter()
Janne Grunau [Mon, 13 Feb 2012 21:12:54 +0000 (22:12 +0100)]
rv40: prevent undefined signed overflow in rv40_loop_filter()

12 years agorv34: use AVERROR return values in ff_rv34_decode_frame()
Janne Grunau [Mon, 13 Feb 2012 20:14:19 +0000 (21:14 +0100)]
rv34: use AVERROR return values in ff_rv34_decode_frame()

Also adds an error message.

12 years agorv34: use uint16_t for RV34DecContext.deblock_coefs
Janne Grunau [Thu, 9 Feb 2012 20:19:16 +0000 (21:19 +0100)]
rv34: use uint16_t for RV34DecContext.deblock_coefs

It is used as bitfield with 16 entries.

12 years agoFix compilation with old yasm that does not support AVX.
Carl Eugen Hoyos [Tue, 14 Feb 2012 11:03:55 +0000 (12:03 +0100)]
Fix compilation with old yasm that does not support AVX.

12 years agolibrtmp: Add "lib" prefix to librtmp URLProtocol declarations.
Diego Biurrun [Mon, 13 Feb 2012 18:37:25 +0000 (19:37 +0100)]
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.

This allows easily differentiating between both implementations within the build
system and combining the native implementation for plain RTMP with librtmp for
the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.

12 years agomovenc: Use defines instead of hardcoded numbers for RTCP types
Martin Storsjö [Tue, 14 Feb 2012 09:10:52 +0000 (11:10 +0200)]
movenc: Use defines instead of hardcoded numbers for RTCP types

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agosmjpegdec: implement seeking
Paul B Mahol [Tue, 14 Feb 2012 03:48:42 +0000 (03:48 +0000)]
smjpegdec: implement seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years agoswscale: Remove some write-only variables related to alpha handling.
Diego Biurrun [Mon, 13 Feb 2012 19:03:30 +0000 (20:03 +0100)]
swscale: Remove some write-only variables related to alpha handling.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Feb 2012 02:23:58 +0000 (03:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: fix crashes in yuv2yuvX on x86-32.
  sunrast: Add fate test for gray8.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: add missing PIX_FMT_YUVA444P
Paul B Mahol [Tue, 14 Feb 2012 00:47:50 +0000 (00:47 +0000)]
lavc: add missing PIX_FMT_YUVA444P

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Feb 2012 00:53:31 +0000 (01:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Use 4 byte startcodes for H.264
  matroskadec: Mark variable as av_unused.
  Move some conditionally used variables into the block where they are used.
  Drop some completely unnecessary av_unused attributes.
  swscale: Remove unused variable alpMmxFilter.
  Drop unnecessary av_uninit attributes from some variable declarations.
  movenc: Support muxing wmapro in ismv/isma
  mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
  swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
  swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
  swscale: use yuv2packed1() functions for unscaled chroma also.
  swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
  swscale: fix invalid memory accesses in yuvpacked1() functions.
  Move PS2 MMI code below the mips subdirectory, where it belongs.
  mips: Move MMI function declarations to a header.
  build: Set correct dependencies for rtmp* protocols implemented by librtmp.

Conflicts:
libavcodec/ac3enc_template.c
libavformat/mpegtsenc.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agojpeglsdec: fix bpp & limit.
Michael Niedermayer [Mon, 13 Feb 2012 22:51:37 +0000 (23:51 +0100)]
jpeglsdec: fix bpp & limit.

Fixes: Tikcet969

Thanks-to: ITU for the freely available spec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agojpeglsdec: Prevent out of array write.
Michael Niedermayer [Mon, 13 Feb 2012 22:50:35 +0000 (23:50 +0100)]
jpeglsdec: Prevent out of array write.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoiff: Fix decode_ham_plane32() buf_size.
Michael Niedermayer [Mon, 13 Feb 2012 21:04:22 +0000 (22:04 +0100)]
iff: Fix decode_ham_plane32() buf_size.

The wrong variable was passed into decode_ham_plane32()
Fixes: Ticket922

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: remove unneeded ost->picref check.
Clément Bœsch [Mon, 13 Feb 2012 22:24:31 +0000 (23:24 +0100)]
ffmpeg: remove unneeded ost->picref check.

If there ost->picref is NULL, it will likely crash anyway a few lines
below by dereferencing it in order to access video attribute.

12 years agoffmpeg: remove pointless avcodec_get_frame_defaults().
Clément Bœsch [Mon, 13 Feb 2012 22:23:15 +0000 (23:23 +0100)]
ffmpeg: remove pointless avcodec_get_frame_defaults().

filtered_frame is overwritten just below anyway.

12 years agoffmpeg: raise ENOMEM on avfilter_graph_alloc() failure.
Clément Bœsch [Mon, 13 Feb 2012 22:21:50 +0000 (23:21 +0100)]
ffmpeg: raise ENOMEM on avfilter_graph_alloc() failure.

12 years agoswscale: fix crashes in yuv2yuvX on x86-32.
Ronald S. Bultje [Mon, 13 Feb 2012 21:28:50 +0000 (13:28 -0800)]
swscale: fix crashes in yuv2yuvX on x86-32.

They were introduced in an earlier commit that introduced use of named
arguments. One cause was a typo, a second cause appears to be a bug in
x264asm that I work around by not using named arguments.

12 years agosunrast: Add fate test for gray8.
Aneesh Dogra [Sun, 12 Feb 2012 17:48:49 +0000 (17:48 +0000)]
sunrast: Add fate test for gray8.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
12 years agortpdec: Use 4 byte startcodes for H.264
Matthew Szatmary [Wed, 8 Feb 2012 13:00:40 +0000 (15:00 +0200)]
rtpdec: Use 4 byte startcodes for H.264

If muxing into mpegts, 4 byte startcodes for the first NAL
of an access unit is required. Thus it is simplest for the
RTP depacketizer to just use 4 byte startcodes everywhere.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoUpdate mkv seek tests.
Reimar Döffinger [Mon, 13 Feb 2012 20:29:26 +0000 (21:29 +0100)]
Update mkv seek tests.

Seek beyond the end will now directly return an error instead
of claiming to succeed and then return EOF immediately on next read.
This change is because before 47e015e6f1913f7da943898eb7716a954f947ff7
mkv seek incorrectly never failed.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agomatroskadec: properly fall back to generic seek.
Reimar Döffinger [Sun, 12 Feb 2012 13:09:03 +0000 (14:09 +0100)]
matroskadec: properly fall back to generic seek.

In particular, detect when the index is obviously broken.
This fixes the worst symptoms of trac issue #958 and makes
sense to allow seeking in files without index.
However it is possible that there still is an index parsing bug
with that file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>