08d0969c14
lavu/opt: change the way default pixel and sample format value is set
...
Use the i64 field rather than the string value. Using a string to set a
default sample/pixel format is weird, also the new interface is more
consistent with the rest of the API.
This is technically an API break, but hopefully there are no applications
using this feature outside of FFmpeg. In order to save backward
compatibility with mixed libraries in case libavutil is updated but not
the other libraries, some ifdeffery hacks are added.
Note that the version check is only performed when class->version != 0,
since if it is not defined then we assume that no version was defined and
the class is not affected by the change.
We will luckily get rid of the hack at the next major bump.
2012-11-30 00:01:53 +01:00
42d3fea65f
Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
...
* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
asink_nullsink: plug a memory leak.
x86: h264_idct: port to cpuflags
x86: cpu: Drop unused HAVE_RWEFLAGS condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 13:32:17 +01:00
490df522c7
x86: cpu: Drop unused HAVE_RWEFLAGS condition
...
The test for rweflags was dropped in a previous commit.
2012-11-28 00:28:09 +01:00
b4d4e51027
Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
...
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
riff: only warn on a bad INFO chunk code size instead of failing
configure: Add separate list for libraries and use where appropriate
x86: float_dsp: add SSE version of vector_fmul_scalar()
Conflicts:
configure
libavformat/riff.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-27 14:10:05 +01:00
2684d2e3ea
Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'
...
* commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b':
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
aacenc: use the correct output buffer
aacdec: fix signed overflows in lcg_random()
base64: fix signed overflow in shift
Conflicts:
libavcodec/dsputil.c
libavutil/base64.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-27 13:39:52 +01:00
947f933687
x86: float_dsp: add SSE version of vector_fmul_scalar()
2012-11-26 11:30:19 -05:00
284ea790d8
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
2012-11-26 11:29:06 -05:00
dd3b73f390
base64: fix signed overflow in shift
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-26 13:34:58 +00:00
2624027439
lavu: drop time redefinition as it causes some problems in some uncommon configurations.
...
Based-on: e96d90eed6
2012-11-26 02:23:30 +01:00
b473c9937e
lavu/samplefmt: return the size of the allocated samples buffer at the next bump
...
Make the functions av_samples_fill_arrays, av_samples_alloc, and
avcodec_fill_audio_frame return a buffer size rather than 0 in case of
success. This will be enabled at the next libavutil major bump, in order
to preserve backward compatibility.
Returning the size allows to simplify the code, avoiding a few function
calls.
2012-11-25 23:23:24 +01:00
e96d90eed6
remove #defines to prevent use of discouraged external functions
...
Preventing the use of discouraged or 'insecure' external functions
through defines in an internal header is not a good solution. The
header is not guaranteed to be included universally which makes
overlooking bad use of said functions during review more likely.
There are cases were those functions either are the most straight
forward solution or even have to be used. Using malloc or free is
required if the allocation or release is done by other libraries.
2012-11-25 23:02:04 +01:00
51e9f58e1c
lavu/opt: add support for reading pixel and sample format through av_get_int()
...
Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to
AV_OPT_TYPE_SAMPLE/PIXEL_FMT.
2012-11-25 20:31:39 +01:00
252746d052
lavu/imgutils: add consistency checks to av_image_copy_plane()
...
Add assertions and abort in case of invalid |dst_linesize| < bytewidth or
|src_linesize| < bytewidth.
Avoid to silently corrupt memory.
2012-11-25 18:19:59 +01:00
26c531cc22
lavu/opt: fix range shown in set_format() log message
2012-11-25 15:50:46 +01:00
c70ec631c9
lavu/opt: add av_opt_ accessors for pixel/format/image size options
...
The interface is implemented against the style of the other options
accessors. Possibly simplify programmatic setting of options.
2012-11-25 15:01:33 +01:00
0efcf16a3e
replace av_log(0, by av_log(NULL,
...
The first parameter is a pointer and NULL is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:10:02 +01:00
25ca8aef54
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
...
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
av_memcpy_backptr: optimise some special cases
mpegvideo: simplify dxy calculation in hpel_motion()
build: add rules to generate preprocessed source files
Conflicts:
Makefile
libavutil/mem.c
library.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 13:30:51 +01:00
4a606c830a
av_memcpy_backptr: optimise some special cases
...
- Add special cases for offsets of 2, 3, or 4 bytes. This means the
offset is always >4 in the generic case, allowing 32-bit copies to
be used there.
- Don't use memcpy() for sizes less than 16 bytes.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:04:17 +00:00
e41b518555
mips: Fixing HAVE_MIPSFPU dependencies
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:57:29 +01:00
9ccc349f77
ensure comment blocks that contain doxygen commands start with double asterix
...
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:55:15 +01:00
1dafbdac65
pixdesc: fix alpha flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:07:34 +01:00
649d8bd8a5
pixdesc: add av_get_padded_bits_per_pixel()
...
This will be needed to allow removing the PixFmtInfo table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 17:05:50 +01:00
494945cb66
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
...
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
avcodec: split avpicture from imgconvert
pixdesc: add PIX_FMT_ALPHA flag
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 15:37:01 +01:00
cbe5a60c9d
pixdesc: add PIX_FMT_ALPHA flag
2012-11-20 12:45:58 +01:00
a74ae4691a
mips: Optimization of AC3 FP encoder and EAC3 FP decoder
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reveiwed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-19 22:24:44 +01:00
e6d81ce22e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: h264_intrapred: Fix C function names in comments
x86: SPLATD: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-19 14:24:20 +01:00
87af05c575
x86: SPLATD: port to cpuflags
2012-11-18 18:34:05 +01:00
4cd74c8143
lavu/bprint: implement av_bprint_strftime().
2012-11-17 19:47:56 +01:00
abf91f7fee
Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'
...
* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
h264: Fix parameters to ff_er_add_slice() call
h264: always check ref_count for validity
Conflicts:
libavcodec/h264.c
libavutil/cpu.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 12:58:00 +01:00
7b723ed4c0
cpu: add a few cpu names as aliases for their cpu flags
...
Help to complete this list is welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 02:09:56 +01:00
65e57975b9
cpu: add cmov ro the table, which appears to have been forgotten
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 02:09:56 +01:00
8f5587c3d0
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
2012-11-16 15:04:48 +01:00
ff3b59c848
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: port to cpuflags
crc: av_crc() parameter names should match between .c, .h and doxygen
avserver: replace av_read_packet with av_read_frame
avserver: fix constness casting warnings
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-16 13:23:35 +01:00
8ff0f7763d
crc: av_crc() parameter names should match between .c, .h and doxygen
2012-11-16 10:38:23 +01:00
926481078b
lavu/opt: fix av_opt_get_key_value() API.
...
Do not skip the end delimiter.
Reserve positive return values.
This is an API break, but the function was introduced less than
two weeks ago.
2012-11-16 10:36:45 +01:00
4d941eac16
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
...
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:12:25 +01:00
7ba0c1b390
avutil: change GET_UTF8 to not use av_log2()
...
This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-14 13:50:42 +00:00
a1b5c9634e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: mmx2 ---> mmxext in asm constructs
Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 12:34:30 +01:00
d4e74d5d6d
Remove deprecation of avcodec_get_chroma_sub_sample.
...
Add explanations what the difference between the 2 functions are and
when either should be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 12:04:39 +01:00
e13d5e9a4b
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
...
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
26301caaa1
x86: mmx2 ---> mmxext in asm constructs
2012-11-14 00:58:51 +01:00
c1a02e884a
pixdesc: add av_pix_fmt_get_chroma_sub_sample
...
Deprecate avcodec_get_chroma_sub_sample.
2012-11-13 16:14:55 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
da501ea857
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'
...
* commit '802713c4e7b41bc2deed754d78649945c3442063':
mss2: prevent potential uninitialized reads
mss2: reindent after last commit
mss2: fix handling of unmasked implicit WMV9 rectangles
configure: add lavu dependency to lavr/lavfi .pc files
x86inc: Set program_name outside of x86inc.asm
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 10:57:06 +01:00
2b479bcab0
build: Drop AVX assembly ifdefs
...
An assembler able to cope with AVX instructions is now required.
2012-11-11 20:43:28 +01:00
5980f5dd18
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
2012-11-11 13:35:12 -05:00
f0d124f005
x86inc: Set program_name outside of x86inc.asm
...
This reduces the local difference to the x264 upstream version.
2012-11-11 11:06:19 +01:00
2ce64413e2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: PALIGNR: port to cpuflags
x86: h264_qpel_10bit: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 12:44:39 +01:00
4b60fac419
x86: PALIGNR: port to cpuflags
2012-11-09 21:31:31 +01:00
1c6962dc20
lavu: remove disabled FF_API_OLD_EVAL_NAMES code
2012-11-07 23:18:05 +01:00
Stefano Sabatini
Michael Niedermayer
Diego Biurrun
Justin Ruggles
Mans Rullgard
Janne Grunau
Bojan Zivkovic
Peter Ross
Luca Barbato
Nicolas George