Michael Niedermayer
8772156be0
Merge remote branch 'qatar/master'
...
* qatar/master:
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Introduce slice threads flag.
FATE: allow forcing thread-type when doing threaded fate runs.
Use av_log_ask_for_sample() where appropriate.
error: sort, pack, and align error code and string definitions
The stabilization period after version bumps should be one month, not one week.
applehttp: Expose the stream bitrate via metadata
doc: Add some initial docs on the applehttp demuxer
Provide a fallback version of the libm function trunc
libavdevice: Define _XOPEN_SOURCE for usleep
lavc: provide deprecated avcodec_thread_init until next major version
lavc: provide the opt.h header until the next bump
error: change AVERROR_EOF value
error: remove AVERROR_NUMEXPECTED
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
Ronald S. Bultje
94f7451a3a
Introduce slice threads flag.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-21 19:42:19 -04:00
Michael Niedermayer
2d2b5a1421
10l, commit that should have been stashed into the merge.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:59:00 +02:00
Michael Niedermayer
c40798441f
Merge remote branch 'qatar/master'
...
* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket
Politic commits that have not been pulled:
Update regtest checksums after revision 6001dad
.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:43:54 +02:00
Diego Biurrun
6001dad6e2
Replace more FFmpeg references by Libav.
2011-04-17 19:31:49 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Baptiste Coudurier
2a5db1aa58
In dv decoder, set sample aspect aspect ratio, fix issue #1612
...
Originally committed as revision 25232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:31:29 +00:00
Måns Rullgård
375fb9f17a
dv: fix alignment of scratch buffer
...
Originally committed as revision 24854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 19:49:47 +00:00
Carl Eugen Hoyos
0fd0ef7947
Add new decoder property max_lowres and do not init decoder if requested value is higher.
...
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 21:23:36 +00:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Reimar Döffinger
5b9c11ff96
Fix indentation.
...
Originally committed as revision 22721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 20:58:19 +00:00
Reimar Döffinger
c787cb339e
Add support for hard-coding the 256kB large dv_vlc_map table.
...
Originally committed as revision 22622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 16:03:45 +00:00
Reimar Döffinger
10249a5f31
Split VLC-related tables out of dvdata.h to make it easier to add support
...
for hard-coding tables.
Originally committed as revision 22620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 14:43:50 +00:00
Måns Rullgård
40d1122752
Use LOCAL_ALIGNED macro for local arrays
...
Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 20:36:20 +00:00
Måns Rullgård
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
Michael Niedermayer
9514a0841a
Align mb_bit_buffer and vs_bit_buffer as their alignment is checked by assert().
...
Originally committed as revision 21164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 13:54:35 +00:00
Tomas Härdin
6d01a97c86
Fail earlier for unsupported resolutions or pixel formats when encoding
...
dv.
Patch by Tomas Härdin, tomas D hardin A codemill D se
Originally committed as revision 20803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 23:56:49 +00:00
Ronald S. Bultje
c47ca25e74
Make get_bits_left() available for use in libavcodec (was previously held
...
private in dv.c for some reason). See "[PATCH] get_bits_left()" thread.
Originally committed as revision 20490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 22:10:43 +00:00
Reimar Döffinger
c76911bd65
Split parts of dvdata.h into dvdata.c, this ensures that things like
...
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.
Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 07:55:57 +00:00
Reimar Döffinger
8f1e203a56
Use context instead of NULL for logging.
...
Originally committed as revision 20085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 19:18:51 +00:00
Reimar Döffinger
ebb651d5f2
Make sure that dv encoder initializes all encoded packet data.
...
The specification does not say which value to use for unused
parts, so fill all unused bytes with 0xff, which is consistent
with what DV usually uses for reserved or unused parts.
Originally committed as revision 20084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 19:17:18 +00:00
Reimar Döffinger
2ba8301769
Mark all pix_fmts and supported_framerates compound literals as const.
...
Makes no difference for gcc but at least icc can put them in .rodata then.
Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 16:09:21 +00:00
Måns Rullgård
20e7c8ae0a
Remove some unnecessary alignment specifiers
...
None of these arrays are used in ways requiring extra alignment.
Originally committed as revision 19715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 12:12:40 +00:00
Baptiste Coudurier
2c608fed3a
print error when dv frame profile cannot be found
...
Originally committed as revision 19193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:41:30 +00:00
Baptiste Coudurier
d509c743b7
check if frame size matches old sys and assumes corrupted input, fixes #1192
...
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:34:28 +00:00
Baptiste Coudurier
b8df8d0d1c
remove cast and use put_sbits, fix assertion in put_bits
...
Originally committed as revision 19024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 06:33:58 +00:00
David Conrad
580a7465fb
Add a chroma_sample_location field to define positioning of chroma samples
...
Originally committed as revision 18795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 04:34:23 +00:00
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Stefano Sabatini
b275500706
Split bitstream.h, put the bitstream writer stuff in the new file
...
put_bits.h.
Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:35:26 +00:00
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Roman Shaposhnik
ce83d2bd37
Fixing a value returning issue
...
Originally committed as revision 17469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-20 02:00:44 +00:00
Roman Shaposhnik
94ed2a303d
transitioning dv_guess_dct_mode to dsputil cmp function
...
Originally committed as revision 17449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 00:34:42 +00:00
Diego Biurrun
1bf6e565dd
cosmetics: 'const static' --> 'static const' to avoid warnings of the type
...
"'static' is not at beginning of declaration" with -Wextra.
Originally committed as revision 17391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-17 12:03:10 +00:00
Roman Shaposhnik
f52901b305
No need to compute stype
...
Originally committed as revision 16988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 16:16:53 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Baptiste Coudurier
7591b30499
remove some warnings due to avctx->execute
...
Originally committed as revision 16909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 22:49:58 +00:00
Ben Hutchings
f579d24bad
assume widescreen when ratio also > 17, patch by Ben Hutchings, ben at decadent dot org dot uk
...
Originally committed as revision 16907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 22:16:17 +00:00
Roman Shaposhnik
1a969d6dfe
Cosmetics: fixing indentation
...
Originally committed as revision 16880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:50:18 +00:00
Roman Shaposhnik
77cd35cdb5
unrolling encoding loops
...
Originally committed as revision 16879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:46:25 +00:00
Roman Shaposhnik
b45ba151cf
Cosmetics: simplifying static initialization
...
Originally committed as revision 16878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:41:04 +00:00
Roman Shaposhnik
85eca52be4
simplifying DIF encoding process
...
Originally committed as revision 16877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:39:05 +00:00
Roman Shaposhnik
76bd5997a9
Cosmetics: fixing the indentation
...
Originally committed as revision 16876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:37:31 +00:00
Roman Shaposhnik
9b8390bfbe
factoring code into dv_init_enc_block
...
Originally committed as revision 16875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:36:38 +00:00
Roman Shaposhnik
5c2a9dd64e
Cosmetics: replacing 0 with NULL for pointer assignment
...
Originally committed as revision 16874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:36:00 +00:00
Roman Shaposhnik
2331854d0b
Cosmetics: moving the function definition around
...
Originally committed as revision 16873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:35:29 +00:00
Roman Shaposhnik
b25d439233
Replacing the constant with a macro
...
Originally committed as revision 16872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 01:34:44 +00:00
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00