generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,155 Commits 24 Branches 241 Tags 173 MiB
caf63ebd0b
Commit Graph

32155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
64160ef392 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-04 01:40:29 +02:00
Michael Niedermayer
72b0c9f55f avidec: skip seek pos adjustment for non interleaved files. 
Fixes Ticket327

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-04 01:33:40 +02:00
Stefano Sabatini
4ce0a94656 lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
Diego Biurrun
fed6c90b68 cosmetics: remove some stray comments from AVCodec declarations 2011-08-03 23:31:45 +02:00
Diego Biurrun
933a6fd5a1 cosmetics: fix indentation/alignment in AVCodec declarations 2011-08-03 23:31:45 +02:00
Reimar Döffinger
99c7b51641 Abort if command offset decreases, avoids potential endless loop. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-03 20:09:53 +02:00
Reimar Döffinger
1816addc4e Warn when falling back to unreliable UMF fps tag. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-03 20:06:38 +02:00
Michael Niedermayer
46eaaad8dd Detect NI-avi at playtime like mplayer. 
Fixes Ticket333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-03 19:02:33 +02:00
Michael Niedermayer
652c772981 avidec: Fix XAN DPCM demuxing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-03 19:02:33 +02:00
Carl Eugen Hoyos
324b8adca4 Fix a possible miscompilation of cabac with old (broken) compilers. 2011-08-03 13:09:42 +02:00
Carl Eugen Hoyos
08d2cee49c Fix -loop_input. 2011-08-03 11:45:33 +02:00
Carl Eugen Hoyos
eb29649cad Set bits_per_coded_sample when encoding ADPCM. 2011-08-03 11:45:33 +02:00
Stefano Sabatini
f1b7c7e697 vf_boxblur: call avfilter_draw_slice() at the end of draw_slice() 2011-08-03 11:18:15 +02:00
Stefano Sabatini
a342517710 vf_boxblur: fix out-of-buffer access when h > w 
Increase size of the private temporary buffers from w to FFMAX(w, h),
indeed they are used also for blurring vertical lines with length h.
 2011-08-03 11:18:15 +02:00
Stefano Sabatini
d68ba3feb8 vf_boxblur: prefer the name "len" over "w" in the blur routines 
Make more clear the meaning of the variables. They specify the length
of a (vertical or horizontal) line rather than a width.
Less confusing.
 2011-08-03 11:18:15 +02:00
Måns Rullgård
9a83adaf34 arm: Avoid using the movw instruction needlessly 
This fixes building for ARM11 without Thumb2.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-08-03 11:56:58 +03:00
Martin Storsjö
d0a2f0af9d Move an int64_t down in MpegEncContext 
This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-08-03 11:56:56 +03:00
Michael Niedermayer
1d186e9e12 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
  swscale: use 15-bit intermediates for 9/10-bit scaling.
  dct32: Add SSE2 ASM optimizations
  Correct chroma vector calculation for RealVideo 3.
  lavf: Add an option to discard corrupted frames
  mpegts: Mark wrongly-sized packets as corrupted
  mpegts: Move scan test to handle_packets
  mpegts: Mark corrupted packets
  mpegts: Reset continuity counter on seek
  mpegts: Fix for continuity counter
  mpegts: Silence "can't seek" warning on unseekable
  apichange: add an entry for AV_PKT_FLAG_CORRUPT
  avpacket: signal possibly corrupted packets
  mpeg4videodec: remove dead code that would have detected erroneous encoding
  aac: Remove some suspicious illegal memcpy()s from LTP.
  bink: Eliminate unnecessary shadow declaration.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/options.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-02 22:12:18 +02:00
Ronald S. Bultje
62ee0e6a97 Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." 
This reverts commit ac0fb59348. It
causes valgrind errors which I'll want to investigate before
resubmitting this.
 2011-08-02 12:27:43 -07:00
Ronald S. Bultje
ac0fb59348 swscale: use 15-bit intermediates for 9/10-bit scaling. 2011-08-02 10:34:02 -07:00
Vitor Sessak
18b131de04 dct32: Add SSE2 ASM optimizations 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-02 10:17:29 -07:00
Kostya Shishkov
6f7fe4723b Correct chroma vector calculation for RealVideo 3. 
Old version divided it wrong, which resulted in chroma drift (visible on FATE
sample too as dirty trails left by clouds).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-02 08:23:47 -07:00
Zohar Kelrich
73e8e8dbf9 lavf: Add an option to discard corrupted frames 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:52:41 +02:00
Zohar Kelrich
5081514269 mpegts: Mark wrongly-sized packets as corrupted 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:52:41 +02:00
Zohar Kelrich
cdb9884a63 mpegts: Move scan test to handle_packets 
This fixes an issue where packets which start being read
while reading the header stick around after a seek.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:52:27 +02:00
Zohar Kelrich
ce9e31655e mpegts: Mark corrupted packets 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:43:22 +02:00
Zohar Kelrich
c64f80b0e8 mpegts: Reset continuity counter on seek 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:43:22 +02:00
Zohar Kelrich
8b9df201df mpegts: Fix for continuity counter 
Make continuity counter respect discontinuity flag
and null packets. Unpack the adaptation_field_control field.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:43:22 +02:00
Zohar Kelrich
be9c00615b mpegts: Silence "can't seek" warning on unseekable 
Do not try to seek when we already know we are not allowed to.
Silences warning that always happens when streaming.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:43:21 +02:00
Luca Barbato
5038f9b268 apichange: add an entry for AV_PKT_FLAG_CORRUPT 2011-08-02 02:43:10 +02:00
Luca Barbato
9d39cbf6cf avpacket: signal possibly corrupted packets 
Use AV_PKT_FLAG_CORRUPT flag to mark packets that might be incomplete
or have errors. Formats that have a mean to validate their packets
should use this flag to deliver such information instead of silently
dropping the packets.
 2011-08-02 02:19:31 +02:00
Dustin Brody
4326f6f525 mpeg4videodec: remove dead code that would have detected erroneous encoding 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-01 21:06:48 +02:00
Alex Converse
a6c49f18ab aac: Remove some suspicious illegal memcpy()s from LTP. 2011-08-01 09:39:33 -07:00
Alex Converse
e11a5fccb2 bink: Eliminate unnecessary shadow declaration. 2011-08-01 09:39:33 -07:00
Michael Niedermayer
03cbe6c8bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
Not merged:  Remove the ffserver test.
  Remove ffserver.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-01 18:32:52 +02:00
Compn
29d854d6c5 correct shorthand ffmpeg-dev > ffmpeg-devel 2011-08-01 09:55:54 -04:00
Anton Khirnov
b4ea1c5a77 Remove the ffserver test. 
It doesn't work and is therefore useless.
 2011-08-01 11:36:16 +02:00
Anton Khirnov
e5fc6ab665 Remove ffserver.h 
It's unused an serves no purpose.
 2011-08-01 11:36:16 +02:00
Carl Eugen Hoyos
318fd9dac2 Remove non-existing fourcc " Y8". 
This reverts a line of r1842.
 2011-08-01 01:26:55 +02:00
Carl Eugen Hoyos
1c5480651e Support FourCC DreX as MPEG4 ASP. 2011-08-01 01:23:39 +02:00
Carl Eugen Hoyos
b36bd27fbe Rm lavfi-showfiltfmts on make testclean. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
940a116b1f Unbreak ffplay -s and ffplay -pix_fmt. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
8460b757c2 Do not ignore opt_default() return values. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
222b333ed5 Cosmetics: Restore alphabetical order. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
9b60b076fb Support muxing MP1, MP2 and MP3 in caf. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
c6e0332f30 Explicitely fail for unsupported codecs when muxing caf. 2011-08-01 00:58:49 +02:00
Carl Eugen Hoyos
b35477a2f2 Use av_get_bits_per_sample() for mBitsPerChannel in caf. 2011-08-01 00:58:49 +02:00
Naoya OYAMA
7747a091f5 Cosmetics: Fix indentation. 2011-08-01 00:58:49 +02:00
Michael Niedermayer
335bbe424f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-01 00:35:57 +02:00
Dustin Brody
18cb40f074 lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-31 14:53:38 -07:00