virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
30,772 Commits 37 Branches 400 Tags 458 MiB
173cd695cb
Commit Graph

30772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
173cd695cb Merge remote-tracking branch 'qatar/master' 
* qatar/master: (24 commits)
  utils: Drop pointless '#if 1' preprocessor directive.
  ac3enc: remove empty ac3_float function that is never called
  ac3enc: split templated float vs. fixed functions into a separate file.
  ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
  ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions.
  Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications.
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  h264_parser: Fix whitespace after previous change.
  h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
  wav: remove an invalid free().
  lavf: initialise reference_dts in av_estimate_timings_from_pts.
  h264: don't be so picky on decoding pps in extradata.
  avcodec.h: add or elaborate on some documentation comments.
  h264: change a few comments into error messages
  ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
  img2: add .dpx to the list of supported file extensions.
  ffv1: fix undefined behavior with insane widths.
  ARM: jrevdct_arm: simplify stack usage
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-14 04:56:26 +02:00
Aurelien Jacobs
fdb5e02901 matroskadec: properly decode color space in an endian neutral way 2011-06-14 02:00:06 +02:00
Aurelien Jacobs
5fec3a2539 matroskadec: use a temporary fourcc variable 2011-06-14 01:58:11 +02:00
Aurelien Jacobs
f440f74205 matroskaenc: ensure the written colorspace don't depend on host endianness 2011-06-14 01:53:40 +02:00
Diego Biurrun
35bdaf3d42 utils: Drop pointless '#if 1' preprocessor directive. 2011-06-13 23:02:28 +02:00
Justin Ruggles
38c304addd ac3enc: remove empty ac3_float function that is never called 2011-06-13 16:49:35 -04:00
Justin Ruggles
e0cc66df61 ac3enc: split templated float vs. fixed functions into a separate file. 
Function pointers are used for templated functions instead of needlessly
duplicating many functions.
 2011-06-13 16:49:35 -04:00
Justin Ruggles
e754dfc0bb ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct 
This will allow the same struct to be used for both the fixed and float ac3
encoders.
 2011-06-13 16:49:35 -04:00
Justin Ruggles
36151b3e31 ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output 
functions.
 2011-06-13 16:49:35 -04:00
Jason Garrett-Glaser
504811baea Roll back 4:4:4 H.264 for now 
Needs some ARM/PPC asm modifications.
 2011-06-13 13:38:46 -07:00
Jason Garrett-Glaser
295f0a2503 Fix SVQ3 after adding 4:4:4 H.264 support 2011-06-13 12:21:51 -07:00
Jason Garrett-Glaser
c177cfb4fb H.264: fix CODEC_FLAG_GRAY 
It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0.
 2011-06-13 12:21:49 -07:00
Jason Garrett-Glaser
c9c493872c 4:4:4 H.264 decoding support 
Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.
 2011-06-13 12:21:39 -07:00
Philip Langdale
25f05ddb1a h264_parser: Fix whitespace after previous change. 
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:51:58 +02:00
Philip Langdale
a26ce1e2df h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. 
Currently, the parser is buggy and only processes the stream extradata
when the flag is set. This fixes it to actually inspect the frames.

Whitespce will be fixed in a separate change.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:51:42 +02:00
Carl Eugen Hoyos
8d0786ec6d wav: remove an invalid free(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:47:06 +02:00
Michael Niedermayer
a8fd2f4e02 lavf: initialise reference_dts in av_estimate_timings_from_pts. 
Fixes issue2437.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:46:06 +02:00
Michael Niedermayer
108f318d90 h264: don't be so picky on decoding pps in extradata. 
Fixes issue2517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:45:09 +02:00
Wim Lewis
3de33b00de avcodec.h: add or elaborate on some documentation comments. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:44:51 +02:00
Michael Niedermayer
33aec3f402 h264: change a few comments into error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:44:14 +02:00
Reimar Döffinger
86961eeabf ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:43:52 +02:00
Peter Ross
a31d4b3a99 img2: add .dpx to the list of supported file extensions. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:43:29 +02:00
Michael Niedermayer
294e5475c2 ffv1: fix undefined behavior with insane widths. 
The new tables is large enough to prevent this together with our image size checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:42:14 +02:00
Aurelien Jacobs
e6ba3d4281 replace remaining usage of deprecated av_metadata_set2() by av_dict_set() 2011-06-13 19:02:50 +02:00
Aurelien Jacobs
7ebaa967a2 matroskaenc: write colourspace element for rawvideo tracks 2011-06-13 18:37:32 +02:00
Aurelien Jacobs
eb8de45c3c nsv: simplify probe function 2011-06-13 18:30:55 +02:00
Aurelien Jacobs
223694b404 nsv: return error code instead of discarding it in read_header() 2011-06-13 18:28:54 +02:00
Mans Rullgard
9776e25db9 ARM: jrevdct_arm: simplify stack usage 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-13 12:30:22 +01:00
Mans Rullgard
13743c7ab0 ARM: jrevdct_arm: use push/pop mnemonics 
Use push/pop instead of stmdb/ldmia for stack operations.  This
is the preferred syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-13 12:30:22 +01:00
Mans Rullgard
77cdfde73e ARM: jrevdct_arm: misc cleanup 
- use 'const' macro to define coeff table
- add missing endfunc
- remove superflous directives

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-13 12:30:22 +01:00
Mans Rullgard
5c46ad1da0 ARM: optimised mpadsp_apply_window_fixed 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-13 11:33:44 +01:00
Reinhard Tartler
b95d19b020 Add some (important) changelog entries 2011-06-13 11:28:03 +02:00
Michael Niedermayer
058d03631a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cmdutils: add missing NULL check in parse_options()
  x11grab: remove a memory allocation and the associated memcpy.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 04:39:58 +02:00
Michael Niedermayer
21d5de9303 H264: Reduce pointless diffs to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 03:51:59 +02:00
Michael Niedermayer
f0e9ee8d94 Revert "H264: Split out hl_motion and template it, this seems a bit faster" 
This reverts commit a50f0bea25.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

	libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-13 03:49:36 +02:00
Stefano Sabatini
3fe6bbd5dc libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
Stefano Sabatini
c535494268 avfiltergraph: make the AVFilterInOut alloc/free API public 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini
6119b23a36 avfiltergraph: change the syntax of avfilter_graph_parse() 
Make it returns the list of open inputs and outputs, so it can be
reused by applications.

Breaks API/ABI.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini
86909dd5f7 graphparser: prefer void * over AVClass * for log contexts 2011-06-12 22:46:02 +02:00
Alexander Strange
33eac92a3c h264: Complexify frame num gap shortening code 
By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
(cherry picked from commit 43c0092a80f8212cbb783260bafa157f7b85126e)
 2011-06-12 18:02:24 +02:00
Alexander Strange
53781bf13e Update todo 
All the known bugs in h264 are fixed so I'm calling it done.
(cherry picked from commit 9cec36a6845c17e90a8d0c2cf9b03a00987c31f0)
 2011-06-12 18:01:29 +02:00
Michael Niedermayer
225083ac0a mpeg12: replace 2 asserts by av_assert0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 17:59:23 +02:00
Stefano Sabatini
de85935883 cmdutils: add missing NULL check in parse_options() 
Fix ffplay -i FILE, which was recently broken.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-12 14:19:45 +02:00
Sven C. Dack
2f2c60400a x11grab: remove a memory allocation and the associated memcpy. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-12 12:18:05 +02:00
Michael Niedermayer
d127d26997 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 04:30:19 +02:00
Michael Niedermayer
2291e18e48 Fix --disable-everything 
Breakage was due to ff_find_pix_fmt() usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-12 03:04:07 +02:00
Mans Rullgard
151c584188 build: fix "make install" with documentation disabled 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-11 20:35:53 +01:00
Mans Rullgard
623ffe8c82 build: simplify some conditional targets 
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-11 19:35:47 +01:00
Clément Bœsch
e8876902a9 resample: clarify supported resampling. 
This also fix a crash on 8ch → 2ch requested resampling.
 2011-06-11 15:09:39 +02:00
Stefano Sabatini
d468ed0321 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 
Require "void *" rather than "AVClass *" for the log context type.
 2011-06-11 12:23:03 +02:00