virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
31,557 Commits 37 Branches 400 Tags 463 MiB
3c3daf4d19
Commit Graph

31557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Barchard
f98c9fb27d mpeg1video: don't abort if thread_count is too high. 
Instead, just decrease it to a valid value and use that.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-09 10:13:57 -07:00
Joakim Plate
a7d3a51dd1 cosmetic: reindent of dxva2 zigzag workaround 2011-07-09 17:30:25 +02:00
Joakim Plate
6dabe0f74a Added ability to enable workaround for dxva2 decoding using older ATI cards 
The workaround need to be enabled per pci id which can not
be detected inside ffmpeg. So this adds a flag that enabled
the alternate behavior.
 2011-07-09 17:21:31 +02:00
Carl Eugen Hoyos
43e96d0466 Support gsm_ms in caf files. 2011-07-09 17:13:13 +02:00
Matthew Hoops
84d098d943 segafilm: add support for videos with cri adx adpcm 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-09 07:57:14 -07:00
Stefano Sabatini
a7aabda267 examples/encoding.c: replace "this library" with "libavcodec" in doxy 
So it is more clear the context of the sentence.
 2011-07-09 15:45:18 +02:00
Stefano Sabatini
ffe3856de7 examples/encoding.c: remove reference to unexisting file 2011-07-09 15:45:12 +02:00
Stefano Sabatini
26f373988d examples/muxing.c: set sample format for encoding 
This is required, or avcodec_open() will abort because of invalid
sample format.
 2011-07-09 15:26:09 +02:00
Tomas Härdin
99fecc64b0 gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps 
Set DV packet durations using fields_per_frame.
This requires turning gxf_stream_info into the demuxer's context for access to the value in gxf_packet().
Since MPEG-2 seems to work fine this done only for DV.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-09 12:32:22 +02:00
Diego Biurrun
d8dbe20241 libxvid: Add const qualifier to silence compiler warning. 
libavcodec/libxvidff.c:752: warning: initialization discards qualifiers from pointer target type
 2011-07-09 12:20:44 +02:00
Michael Niedermayer
58257ea29e Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  mp3enc: write a xing frame containing number of frames in the file
  lavf: update AVStream.nb_frames when muxing.
  ffmpeg: remove unused variables from InputStream.
  doc: update ffmpeg -ar and -ac documentation to reflect reality.
  ffmpeg: remove pointless if (nb_input_files)
  ffmpeg: merge input_files_ts_offset into input_files.
  ffmpeg: merge input_codecs into input_streams.
  ffmpeg: drop AV prefixes from struct names.
  ffmpeg: deprecate loop_input and loop_output options
  gif: add loop private option.
  img2: add loop private option.
  AVOptions: in av_opt_find() don't return named constants unless unit is specified.
  x11grab: replace undocumented nomouse hackery with a private option.
  dict: extend documentation.
  lls: whitespace cosmetics
  docs: Use proper markup for a literal command line option
  docs: Remove a remark that isn't relevant any longer
  docs: Explain how to regenerate import libraries with MSVC tools
  docs: Mention that libraries for MSVC can be built with a cross compiler
  docs: Remove old docs that mention setting up a build environment with lib.exe
  ...

Conflicts:
	doc/ffmpeg.texi
	doc/general.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/dnxhddata.c
	libavformat/mp3enc.c
	libavformat/utils.c
	libavutil/Makefile
	tests/copycooker.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-09 02:06:40 +02:00
Jason Garrett-Glaser
6a2176aac0 H.264: improve qp_thresh check 
Eliminate redundant check in filter_mb_fast, consider bit depth in calculating qp_thresh.
 2011-07-08 16:12:42 -07:00
Jason Garrett-Glaser
99b6d2c065 H.264: use fill_rectangle in CABAC decoding 2011-07-08 16:12:39 -07:00
Jason Garrett-Glaser
298e52c99c H.264: Remove redundant hl_motion_16/8 code 2011-07-08 16:12:36 -07:00
Jason Garrett-Glaser
ef0c594801 H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP 2011-07-08 16:12:12 -07:00
Jason Garrett-Glaser
5136ba7c69 H.264: faster P-SKIP decoding 
Inline the relevant parts of fill_decode_caches into P-SKIP mv prediction to
avoid calling the whole thing.
 2011-07-08 16:11:15 -07:00
Jason Garrett-Glaser
bbdd52ed34 H.264: av_always_inline some more functions 
These weren't getting inlined all the time in all gcc versions.
 2011-07-08 16:09:35 -07:00
Daniel Kang
c0483d0c7a H.264: Add x86 assembly for 10-bit H.264 predict functions 
Mainly ported from 8-bit H.264 predict.

Some code ported from x264. LGPL ok by author.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-08 15:59:29 -07:00
Michael Niedermayer
971c04066c make the RELEASE file say git and not 0.7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-09 00:28:16 +02:00
Ronald S. Bultje
5c391a161a swscale: rename uv_off/uv_off2 to uv_off_px/byte. 2011-07-08 15:15:31 -07:00
Ronald S. Bultje
1ce724ee39 swscale: implement error dithering in planarCopyWrapper. 
Based on a somewhat similar idea in FFmpeg's swscale.
 2011-07-08 15:15:31 -07:00
Ronald S. Bultje
4e3e333a79 swscale: error dithering for 16/9/10-bit to 8-bit. 
Based on a somewhat similar idea in FFmpeg's swscale copy.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
7d7bacf0f1 swscale: fix overflow in 16-bit vertical scaling. 
We operated on 31-bits, but with e.g. lanczos scaling, values can
add up to beyond 0x80000000, thus leading to output of zeroes. Drop
one bit of precision fixes this.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
bf2cba4532 swscale: fix crash in 8-bpc bilinear output without alpha. 
We accessed the alpha array even it wasn't used and didn't
exist, hence leading to a NULL pointer segfault.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
f44d50a94c swscale: fix 16-bit horizontal scaling underflow. 
When using e.g. lanczos scaling, values can drop below 0, so they
should never be unsigned.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
42d622fab3 swscale: fix 16-bit scaling when output is 8-bits. 
We would use the second half of the U plane buffer, rather than the
V plane buffer, to output the V plane pixels.
 2011-07-08 15:15:30 -07:00
Anton Khirnov
bda168d2b0 mp3enc: write a xing frame containing number of frames in the file 2011-07-08 22:47:24 +02:00
Anton Khirnov
1c6d2b7df0 lavf: update AVStream.nb_frames when muxing. 2011-07-08 22:13:52 +02:00
Anton Khirnov
e98bc78ca1 ffmpeg: remove unused variables from InputStream. 2011-07-08 19:58:23 +02:00
Anton Khirnov
a58db9d283 doc: update ffmpeg -ar and -ac documentation to reflect reality. 2011-07-08 19:58:23 +02:00
Anton Khirnov
20f9f21fd4 ffmpeg: remove pointless if (nb_input_files) 
It's required to be non-zero since
cc58300e30
 2011-07-08 19:58:23 +02:00
Anton Khirnov
27e91f37f5 ffmpeg: merge input_files_ts_offset into input_files. 2011-07-08 19:58:23 +02:00
Anton Khirnov
9e253c13d0 ffmpeg: merge input_codecs into input_streams. 
There's no point in keeping them separate.
 2011-07-08 19:58:23 +02:00
Anton Khirnov
17c8cc550d ffmpeg: drop AV prefixes from struct names. 
Those are reserved for the libs.
 2011-07-08 19:58:22 +02:00
Anton Khirnov
f5302e5dcf ffmpeg: deprecate loop_input and loop_output options 
They were replaced by (de)muxer private options.
 2011-07-08 19:58:19 +02:00
Anton Khirnov
d31e3f7ccc gif: add loop private option. 
Deprecate AVFormatContext.loop_output.
 2011-07-08 18:39:56 +02:00
Anton Khirnov
6002fdef5e img2: add loop private option. 
Deprecate AVFormatContext.loop_input.
 2011-07-08 18:39:28 +02:00
Anton Khirnov
a726d7fd4e AVOptions: in av_opt_find() don't return named constants unless unit is specified. 
That is, unless the caller explicitly asks for them.

Prevents conflict between e.g. the 'loop' option in img2 demuxer and
'loop' flag in AVCodecContext.
 2011-07-08 18:34:18 +02:00
Anton Khirnov
ce558c8f59 x11grab: replace undocumented nomouse hackery with a private option. 2011-07-08 18:30:21 +02:00
Anton Khirnov
8c28e01d31 dict: extend documentation. 2011-07-08 18:29:27 +02:00
Mans Rullgard
fdaf1d0640 lls: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-08 15:03:40 +01:00
Martin Storsjö
a3a94e1498 docs: Use proper markup for a literal command line option 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:28:06 +03:00
Martin Storsjö
a0db0b302c docs: Remove a remark that isn't relevant any longer 
Now the bin directory only contains those DLLs that are actually used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:17:59 +03:00
Martin Storsjö
37e6e6d313 docs: Explain how to regenerate import libraries with MSVC tools 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:17:58 +03:00
Martin Storsjö
b8272cc2cf docs: Mention that libraries for MSVC can be built with a cross compiler 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:17:57 +03:00
Martin Storsjö
e4e3cdc636 docs: Remove old docs that mention setting up a build environment with lib.exe 
The build system doesn't use lib.exe any longer, and therefore this
can be simplified.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:17:56 +03:00
Martin Storsjö
b369f327d5 docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-08 16:17:53 +03:00
Mans Rullgard
ecf86e1a97 dnxhd: prettify tables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-08 14:16:28 +01:00
Stefano Sabatini
a953577b46 examples: move metadata-example.c to doc/examples 2011-07-08 09:40:30 +02:00
Michael Niedermayer
5d1b39f7e7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: clean up library installation rules
  vf_drawtext: Remove some write-only variables.
  libgsm: Drop const qualifier to silence compiler warning.
  docs: Remove needless configure options
  docs: Don't recommend adding --enable-memalign-hack
  libvo-amrwbenc: Add braces to shut up gcc warning.
  adts: Fix PCE copying.

Conflicts:
	configure
	doc/general.texi
	subdir.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-08 01:05:28 +02:00