1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

30443 Commits

Author SHA1 Message Date
Anton Khirnov
67540af7ba tty: replace AVFormatParameters.sample_rate abuse with a private option. 2011-05-25 16:21:25 +02:00
John Stebbins
656566d7a4 Fix end time of last chapter in compute_chapters_end
Parenthesis are misplaced in calculation of max_time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-25 15:55:48 +02:00
Anton Khirnov
2cf8355f98 ffmpeg: get rid of useless AVInputStream.nb_streams.
It's a duplicate of AVFormatContext.nb_streams.
2011-05-25 15:55:47 +02:00
Anton Khirnov
07633154ad ffmpeg: simplify managing input files and streams
Grow the file and stream list in opt_input_file() instead of creating it
all at once in transcode().  This is simpler and will be useful for
following commits.
2011-05-25 15:55:47 +02:00
Anton Khirnov
d2bc4da15b ffmpeg: purge redundant AVInputStream.index.
AVStream.index stores the same thing.
2011-05-25 15:55:47 +02:00
Anton Khirnov
d20576d01b lavf: deprecate AVFormatParameters.channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
79405e57dc libdc1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
986f4f4918 dv1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
3d2a418605 v4l2: reindent. 2011-05-25 15:55:47 +02:00
Anton Khirnov
a02fd06ab7 v4l2: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
fc68a8f703 lavf: deprecate AVFormatParameters.standard. 2011-05-25 15:55:47 +02:00
Anton Khirnov
b3da269211 v4l2: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
a861ffeffa v4l: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
eb040dbbd3 dv1394: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
e199eb44fd bktr: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov
bffd4dd1d3 lavf: deprecate AVFormatParameters.{channels,sample_rate}. 2011-05-25 15:55:46 +02:00
Anton Khirnov
5b3865fc5f rawdec: add sample_rate/channels private options. 2011-05-25 15:55:46 +02:00
Anton Khirnov
2ea8faf39f ALSA: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov
003e63b6df oss: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov
a1a15a9993 sndio: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov
fb37d57347 lavf: deprecate AVFormatParameters.mpeg2ts_raw.
It doesn't do anything except produce an error message when set.
2011-05-25 15:20:25 +02:00
Anton Khirnov
17a5556db5 mpegts: add compute_pcr option.
Deprecate the corresponding AVFormatParameters field.
2011-05-25 15:20:25 +02:00
Anton Khirnov
5dc8214420 lavf: add priv_class field to AVInputFormat. 2011-05-25 15:20:25 +02:00
Stefano Sabatini
07586b68a8 lavfi: add select filter
Address trac issue #92.
2011-05-25 12:54:07 +02:00
Stefano Sabatini
3c2c52baec eval: implement not() expression 2011-05-25 12:42:19 +02:00
Stefano Sabatini
cf06e3e4dd vsrc_buffer: return an error code if no frames are available
Also decrease the log level of the corresponding message to WARNING,
since the error is not fatal.
2011-05-25 12:42:19 +02:00
Stefano Sabatini
6b5e182540 ffmpeg: handle the case when get_filtered_frame() fails 2011-05-25 12:42:18 +02:00
Stefano Sabatini
48df6a2415 indeo3: add out-of-buffer write check
Prevent out-of-buffer writes. In particular fix smclocki32.avi.1.1
crash, trac issue #114, roundup issue #1482.
2011-05-25 11:29:47 +02:00
Reuben Thomas
39d983461a Add reading of disc number to mov.c 2011-05-25 11:15:56 +02:00
John Stebbins
a3da17730e Fix end time of last chapter in compute_chapters_end(). 2011-05-25 09:49:18 +02:00
Carl Eugen Hoyos
06fd213eb6 Do not reset channel_layout to 0.
The channel_layout may have been set by the demuxer.
2011-05-25 09:49:18 +02:00
Stefano Sabatini
ecf72542fa vsrc_buffer: remove duplicated file description 2011-05-25 09:37:25 +02:00
Michael Niedermayer
034fc7bf12 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  configure: enable memalign_hack automatically when needed
  swscale: unbreak the build on non-x86 systems.
  swscale: remove if(bitexact) branch from functions.
  swscale: remove if(canMMX2BeUsed) conditional.
  swscale: remove swScale_{c,MMX,MMX2} duplication.
  swscale: use emms_c().
  Move emms_c() from libavcodec to libavutil.
  tiff: set palette in the context when specified in TIFF_PAL tag
  rtsp: use strtoul to parse rtptime and seq values.
  pgssubdec: fix incorrect colors.
  dvdsubdec: fix incorrect colors.
  ape: Allow demuxing of files with metadata tags.
  swscale: remove dead macro WRITEBGR24OLD.
  swscale: remove AMD3DNOW "optimizations".
  swscale: remove duplicate code in ppc/ subdirectory.
  swscale: remove duplicated x86/ functions.
  swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
  vsrc_buffer.h: add file doxy
  vsrc_buffer: tweak error message in init()
  msmpeg4: reindent.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25 06:32:45 +02:00
Michael Niedermayer
d1adad3cca Merge swscale bloatup
This will be cleaned up in the next merge

Authorship / merged commits:
commit f668afd489
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 09:12:34 2011 +0200

    swscale: fix "ISO C90 forbids mixed declarations and code" warning

    only hit with --enable-runtime-cpudetect

commit 7f2ae5c7af
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 02:09:44 2011 +0200

    swscale: fix compilation with --enable-runtime-cpudetect

commit b6cad3df82
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 00:31:04 2011 +0200

    swscale: correct include path to fix ppc altivec build

commit 6216fc70b7
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Thu Apr 14 22:03:45 2011 +0200

    swscale: simplify rgb2rgb templating

    MMX is always built. Drop the ifdefs

commit 33a0421bba
Author: Josh Allmann <joshua.allmann@gmail.com>
Date:   Wed Apr 13 20:57:32 2011 +0200

    swscale: simplify initialization code

    Simplify the fallthrough case when no accelerated functions
    can be initialized.

commit 735bf19511
Author: Josh Allmann <joshua.allmann@gmail.com>
Date:   Wed Apr 13 20:57:31 2011 +0200

    swscale: further cleanup swscale.c

    Move x86-specific constants out of swscale.c

commit 86330b4c92
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Wed Apr 13 20:57:30 2011 +0200

    swscale: partially move the arch specific code left

    PPC and x86 code is split off from swscale_template.c. Lots of code is
    still duplicated and should be removed later.

    Again uniformize the init system to be more similar to the dsputil one.

    Unset h*scale_fast in the x86 init in order to make the output
    consistent with the previous status. Thanks to Josh for spotting it.

commit c003832883
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Wed Apr 13 20:57:29 2011 +0200

    swscale: move away x86 specific code from rgb2rgb

    Keep only the plain C code in the main rgb2rgb.c and move the x86
    specific optimizations to x86/rgb2rgb.c
    Change the initialization pattern a little so some of it can be
    factorized to behave more like dsputils.

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/swscale_template.c
2011-05-25 06:24:55 +02:00
Michael Niedermayer
d9d56036f3 swscale: MMX optim of hscale16()
code is based on existing 8bit MMX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25 04:08:34 +02:00
Michael Niedermayer
895b616146 swscale: dont loose bits on planar >8bit yuv ind gray nput.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25 04:08:34 +02:00
Michael Niedermayer
8050dfdfb2 swscale: Switch to ronalds yuv2yuvX16inC_template() its very similar to baptsites
and supports alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25 04:08:08 +02:00
Mans Rullgard
9bbd6a4cd8 configure: enable memalign_hack automatically when needed
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-25 00:47:05 +01:00
ami_stuff
040e1c67ed rawdec: fix decoding of QT WRAW files
Fix decoding of QT WRAW files.

From some tests it results that:

1. all of the AVI/MOV WRAW files (at least from the link posted
   to the trac ticket #108) need to be flipped
2. mov WRAW files need to use AVI color modes
3. assigning PAL8 mode by default to WRAW codec is not correct

Fix decoding of file CarltonMovie2.mov, fix trac issue #108.
2011-05-25 00:13:09 +02:00
Aurelien Jacobs
09525f7956 matroska: improve declaration of video_stereo_* constant tables 2011-05-24 23:34:24 +02:00
Aurelien Jacobs
b44bbf908d matroskadec: fix reverted condition to accept combine_plane operation 2011-05-24 23:26:24 +02:00
Reimar Döffinger
384d10360b Fix register types for LOAD_AB arguments, fixes compilation with NASM. 2011-05-24 22:24:08 +02:00
Ronald S. Bultje
a724ee6265 swscale: unbreak the build on non-x86 systems. 2011-05-24 15:32:03 -04:00
Ronald S. Bultje
1bb0f0c925 swscale: remove if(bitexact) branch from functions.
Instead, only set the function pointers if bitexact flag is
not set during initialization. Since a change in flags triggers
a re-init anyway, this doesn't situations where flag values
change during runtime.
2011-05-24 14:50:20 -04:00
Ronald S. Bultje
566b5fbbb3 swscale: remove if(canMMX2BeUsed) conditional.
Instead, set function pointers conditionally during init. This
patch also reveals a whole branch of dead assembly code that is
therefore also removed.
2011-05-24 14:50:19 -04:00
Ronald S. Bultje
aaca69c130 swscale: remove swScale_{c,MMX,MMX2} duplication. 2011-05-24 14:50:15 -04:00
Ronald S. Bultje
c4fd283a46 swscale: use emms_c(). 2011-05-24 14:48:49 -04:00
Ronald S. Bultje
e973557211 Move emms_c() from libavcodec to libavutil. 2011-05-24 14:48:49 -04:00
Stefano Sabatini
7ca5338b49 tiff: set palette in the context when specified in TIFF_PAL tag
Since image initialization was moved after tag parsing, the
palette needs to be specified in the context and then copied
to the allocated image in init_image().

Fixes a regression with TIFF images that have palette data,
trac issue #230, file Test_Flate_8bpp.tif.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-24 19:33:40 +02:00
Ilya
4515f9b58a rtsp: use strtoul to parse rtptime and seq values.
strtol could return negative values, leading to various error messages,
mainly "non-monotonically increasing dts".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-24 19:11:28 +02:00