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
ef4dc3e55b
lavu/opt: show valid range in case of out-of-range value
...
Improve feedback.
2012-11-07 23:17:57 +01:00
7d26be63c2
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
...
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
flacenc: use uint64_t for bit counts
flacenc: remove wasted trailing 0 bits
lavu: add av_ctz() for trailing zero bit count
flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
fate: aac: Place LATM tests and general AAC tests in different groups
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 22:51:20 +01:00
e859339e7a
Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'
...
* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
x86: PABSW: port to cpuflags
x86: vc1dsp: port to cpuflags
rtmp: Use av_strlcat instead of strncat
Conflicts:
libavcodec/x86/h264_qpel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-05 22:36:05 +01:00
dfde8a34e5
lavu: add av_ctz() for trailing zero bit count
2012-11-05 15:32:29 -05:00
dbb37e7711
x86: PABSW: port to cpuflags
2012-11-05 14:51:10 +01:00
74a50e75a8
lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code
2012-11-04 18:10:39 +01:00
3bdf4971ba
lavu/opt: implement av_opt_get_key_value().
...
This function does the low-level work of av_opt_set_from_string()
but can be used when there is no option context or when a generic
handling of unknown keys is needed.
av_opt_set_from_string() is changed to make use of it.
2012-11-04 10:47:52 +01:00
e021eeb9f0
lavu/opt: parse key into a mallocated buffer.
...
It removes the hardcoded limit on the key size without making
the code much more complex, and it makes for a more versatile API.
2012-11-04 10:47:52 +01:00
ab796ded75
avstring: fix compiler warning about freeing const pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 20:22:53 +01:00
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
1885ffb03d
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
...
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:13:45 +01:00
b91fa5fcca
lavu/opt: set sample format default value, and accept NULL value
...
Fix commit c9eaa98a3e
2012-11-03 13:53:49 +01:00
1dad486714
Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'
...
* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
x86: ac3dsp: port to cpuflags
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
x86inc: Only define program_name if the macro is unset
Conflicts:
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 13:38:38 +01:00
ca11f6b240
lavu/opt: prefer if(){}else{} over if()else{} construct
...
Improve consistency.
2012-11-03 12:14:53 +01:00
481fdeeecf
lavu/opt: add AV_OPT_SAMPLE_FMT option
2012-11-03 12:14:26 +01:00
b4dc6dccba
crc: move doxy to the header
2012-11-02 18:28:56 +01:00
0a7a94f2e5
x86: Refactor PSWAPD fallback implementations and port to cpuflags
2012-11-02 17:05:29 +01:00
26f01bd106
x86: PMINUB: port to cpuflags
2012-11-02 15:38:15 +01:00
61bc2bc7d4
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
...
"mmxext" is a more sensible name and more common in outside projects.
2012-11-02 15:22:34 +01:00
483c1aa5f1
lavu/bprint: add av_bprint_get_buffer().
...
It is useful to use bprint to handle a growing buffer
used with another API.
2012-11-02 15:12:29 +01:00
012f73e271
x86inc: Only define program_name if the macro is unset
...
This allows overriding the value from outside of the file.
2012-11-02 14:38:00 +01:00
6204ea17f1
rational: test add/sub too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 02:59:44 +01:00
25a21c587c
eval-test: add some otherwise untested functions.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 00:32:15 +01:00
adc39b28a5
av_image_copy: check for av_image_get_linesize() failure.
...
Fixes CID703722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 19:12:48 +01:00
Bojan Zivkovic
Michael Niedermayer
Diego Biurrun
Nicolas George
Janne Grunau
Mans Rullgard
Luca Barbato
Justin Ruggles
Stefano Sabatini
Anton Khirnov