videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-30 15:58:23 +02:00
Code Releases Activity
38,769 Commits 36 Branches 393 Tags 220 MiB
c592679cca
Commit Graph

38769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c592679cca eatgq: remove unused ret variable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:05:22 +01:00
Michael Niedermayer
d9399c4b66 eamad: Remove redundant initialization of mv_map. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:04:25 +01:00
Michael Niedermayer
9ff43569d2 g729dec: fix scalarproduct_int16 after API change 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 21:20:07 +01:00
Peter Ross
e05253bf49 iff: do not decode unsupported pbms with ham decoder 
This prevents the segfault reported by ticket #1054
 2012-03-13 21:56:19 +11:00
Michael Niedermayer
b25a265a5c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm-mpeg: convert to bytestream2 API
  Revert "h264: clear trailing bits in partially parsed NAL units"
  remove iwmmxt optimizations
  mimic: do not continue if swap_buf_size is 0
  mimic: convert to bytestream2 API
  frwu: use MKTAG to check marker instead of AV_RL32
  txd: port to bytestream2 API
  c93: convert to bytestream2 API
  iff: make .long_name more descriptive
  FATE: add test for cdxl demuxer
  rtsp: Fix a typo

Conflicts:
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/dsputil_iwmmxt_rnd_template.c
	libavcodec/arm/mpegvideo_iwmmxt.c
	libavcodec/c93.c
	libavcodec/txd.c
	libavutil/arm/cpu.c
	tests/fate/demux.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 01:56:33 +01:00
Lou Logan
2d38081b4f cosmetics: fix some typos 
Patch attached.
From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001
From: Lou Logan <lou@lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 01:14:04 +01:00
Michael Niedermayer
105cac3407 vc1dec: Fix vc1 decoding with --disable-optimizations. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 01:14:04 +01:00
Paul B Mahol
bd3e07c82a pcm-mpeg: convert to bytestream2 API 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-03-12 23:03:57 +01:00
Janne Grunau
8a6037c390 Revert "h264: clear trailing bits in partially parsed NAL units" 
This reverts commit 729ebb2f18.

There was an off-by-one error in the bit mask calculation clearing
actually the last valid bit and causing
http://bugzilla.libav.org/show_bug.cgi?id=227

The broken sample (Mr_MrsSmith-h264_aac.mp4) the commit was fixing
does not work after correcting the off-by-one error.

CC: libav-stable@libav.org
 2012-03-12 22:46:56 +01:00
Janne Grunau
363bd1c62c remove iwmmxt optimizations 
The were broken since August of 2010 without anyone noticing until
three weeks ago. Nobody cares about it anymore and hopefully Marvell
will support NEON like in the PXA978 from now on.
 2012-03-12 22:46:56 +01:00
Nico Weber
599888a480 Move struc FFTContext below SECTION_RODATA 
Yasm creates an implicit unaligned text section if "struc" is used
outside of any section:
http://tortall.lighthouseapp.com/projects/78676-yasm/tickets/247

Since yasm only honors the "align" annotation on the first declaration
of a section, this implicit text section causes all text section
alignments to be ignored. Also fixes a yasm warning about it agnoring
alignment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 21:54:37 +01:00
Andrey Utkin
3069e70f62 udp: Add option overrun_nonfatal 
Optionize fail/survive on circular buffer overrun

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 21:50:46 +01:00
Andrey Utkin
a2eecc110b udp: remove dead code line (unused result) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 21:49:33 +01:00
Michael Niedermayer
b0a0e83aee Revert "flvenc: Remove apparently unneeded AAC check." 
According to video_file_format_spec_v10_1.pdf flv stores AAC RAW
thanks to Baptiste Coudurier for pointing that out

thanks to Aℓex Converse for explaining:
	This can't be at the start of a non-ADTS payload. 111 is the
	EndOfFrame syntax element.

Together these proof that the check was correctly rejecting ADTS which
is not supposed to be in flv. Many players are able to play such ADTS
in flv though but its better if we conform to the spec as this should
ensure that not many but all players can play files generated by ffmpeg.

This reverts commit 3c9a86df0e.
 2012-03-12 20:42:25 +01:00
Paul B Mahol
33c5c3ad07 mimic: do not continue if swap_buf_size is 0 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-12 11:47:48 -07:00
Paul B Mahol
dba425ad7a mimic: convert to bytestream2 API 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-12 11:46:34 -07:00
Paul B Mahol
05d089a80b frwu: use MKTAG to check marker instead of AV_RL32 
Using intreadwrite.h for this is overkill.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-12 11:41:02 -07:00
Paul B Mahol
919f355438 txd: port to bytestream2 API 
Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-12 11:37:47 -07:00
Clément Bœsch
4fe5448790 lavfi/drawtext: add 24 hours wrapping option for timecode. 
Fixes ticket #1044.
 2012-03-12 18:17:02 +01:00
Paul B Mahol
85aded741e c93: convert to bytestream2 API 
Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-12 17:13:42 +02:00
Paul B Mahol
947e103a8f iff: make .long_name more descriptive 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-12 17:02:02 +02:00
Paul B Mahol
5a877d9530 FATE: add test for cdxl demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-12 17:01:58 +02:00
Martin Storsjö
705eeb5eca rtsp: Fix a typo 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-12 16:27:00 +02:00
Michael Niedermayer
88c76c7d22 Revert "udp: add multicast input interface selection" 
This reverts commit 9abd47fe90.

Broke compilation on openbsd and others
 2012-03-12 06:48:32 +01:00
Hendrik Leppkes
0aedd8c0bd dxva2_vc1: pass the overlap flag to the decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 06:12:35 +01:00
Hendrik Leppkes
a3c5aefff2 dxva2_vc1: fix decoding of BI frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 06:11:21 +01:00
Michael Niedermayer
2367b2a502 libavformat.v: add ffio_set_buf_size() for ffserver. 
its inevitable with the current API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 06:04:37 +01:00
Tudor.Suciu
9abd47fe90 udp: add multicast input interface selection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 06:01:09 +01:00
C Chatterjee
3c9a86df0e flvenc: Remove apparently unneeded AAC check. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 05:21:59 +01:00
ami_stuff
86b6e49d92 iff: check for pbm tag 
more robust

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 05:09:37 +01:00
Michael Niedermayer
1c27359867 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsicinvideo: validate buffer offset before copying pixels.
  cook: error out on quant_index values outside [-63, 63] range.
  mpc: pad mpc_CC/SCF[] tables to allow for negative indices.

Conflicts:
	libavcodec/cook.c
	libavcodec/dsicinav.c
	libavcodec/mpc.c
	libavcodec/mpc7.c
	libavcodec/mpcdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 04:35:06 +01:00
Miroslav Slugeň
00969376ce ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 
Fixes Ticket346

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 03:31:59 +01:00
Michael Niedermayer
9fcc62ed9b Revert "ffserver: remove unused variable." 
This reverts commit f02f745e4a.
 2012-03-12 03:31:59 +01:00
Stefano Sabatini
4272dc3ec5 doc: add vf_crop keepaspect documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 17:47:06 +01:00
Baptiste Coudurier
f49cb8e669 vf_crop: keepaspect support 2012-03-11 17:46:31 +01:00
Joseph Artsimovich
84b9b4aa18 Fix frame height vs field height confusion in MXF decoding. 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 17:39:52 +01:00
Paul B Mahol
4ed0d182e2 FATE: add test for cdxl demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 17:25:29 +01:00
Thilo Borgmann
599881b028 alsdec: Fix out of ltp_gain_values read. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 16:56:23 +01:00
Thilo Borgmann
daeffccd98 alsdec: pretty print for another log message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 16:55:42 +01:00
Ronald S. Bultje
c95fefa042 dsicinvideo: validate buffer offset before copying pixels. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-11 07:28:54 -07:00
Matthieu Bouron
ad029c24a6 mxfdec: add timecode to metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 08:12:46 +01:00
Ronald S. Bultje
97e48b2f54 cook: error out on quant_index values outside [-63, 63] range. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-10 17:51:28 -08:00
Michael Niedermayer
c3c2db49a7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cook: expand dither_tab[], and make sure indexes into it don't overflow.
  xxan: reindent xan_unpack_luma().
  xxan: protect against chroma LUT overreads.
  xxan: convert to bytestream2 API.
  xxan: don't read before start of buffer in av_memcpy_backptr().
  vp8: convert mbedge loopfilter x86 assembly to use named arguments.
  vp8: convert inner loopfilter x86 assembly to use named arguments.

Conflicts:
	libavcodec/xxan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-11 01:12:52 +01:00
Carl Eugen Hoyos
6cb89df845 Add missing requirements to libavdevice.pc if lavfi is enabled. 
Fixes ticket #1050.
 2012-03-11 00:48:36 +01:00
Ronald S. Bultje
d7eabd5042 mpc: pad mpc_CC/SCF[] tables to allow for negative indices. 
MPC8 allows indices of mpc_CC up to -1, and mpc_SCF up to -6, thus pad
the tables by that much on the left end.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-10 14:28:08 -08:00
Michael Niedermayer
2440040c7b vc1: add missing entries to ff_vc1_fps_nr. 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-10 23:12:42 +01:00
Michael Niedermayer
8e9a0a3568 mpc7: check subband index 
This fixes a overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-10 23:12:42 +01:00
Michael Niedermayer
ecc31630f9 mjpegb: Detect changing nb of planes in interlaced video. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-10 23:12:42 +01:00
Michael Niedermayer
50f4f272fe indeo3: Fix out of reference reading with NULL blocks. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-10 23:12:42 +01:00
Ronald S. Bultje
442c3a8cb1 cook: expand dither_tab[], and make sure indexes into it don't overflow. 
Fixes overflows in accessing dither_tab[].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-10 12:03:53 -08:00