diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-03 02:41:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-03 03:51:32 +0100 |
| commit | d77294c5e404c8a214da0e74f7836390b48b2dba (patch) | |
| tree | 9c894cf54b1e18f285cc04eaf7e021e9976f4f2b /doc | |
| parent | 9477fa094b89645b3a34ef3bc52c4f18719ab4b3 (diff) | |
| parent | e15e2a6d2a886aa9944ac9798687104c829d1541 (diff) | |
| download | ffmpeg-d77294c5e404c8a214da0e74f7836390b48b2dba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: fix indentation.
vorbis: fix overflows in floor1[] vector and inverse db table index.
win64: add a XMM clobber test configure option.
movdec: Parse the dvc1 atom
ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
swscale: K&R formatting cosmetics for Blackfin code
frwu: lowercase the FRWU codec name
movdec: fix dts generation in fragmented files
fate: make acodec-ac3_fixed test output raw AC3
APIchanges: add missing commit hashes
swscale: implement MMX, SSE2 and AVX functions for RGB32 input.
ra144enc: drop pointless "encoder" from .long_name
bethsoftvideo: fix palette reading.
mpc7: use av_fast_padded_malloc()
mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes
doc: decoding Forward Uncompressed is supported
Fix a typo in the x86 asm version of ff_vector_clip_int32()
pcmenc: Do not set avpkt->size.
ff_alloc_packet: modify the size of the packet to match the requested size
Conflicts:
doc/APIchanges
libavcodec/libx264.c
libavcodec/mpc7.c
libavformat/isom.h
libswscale/Makefile
libswscale/bfin/yuv2rgb_bfin.c
tests/ref/fate/bethsoft-vid
tests/ref/seek/ac3_ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 8 | ||||
| -rw-r--r-- | doc/general.texi | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index bc68cb0b32..d6e4decdf3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -19,18 +19,18 @@ API changes, most recent first: 2012-01-24 - xxxxxxx - lavfi 2.60.100 Add avfilter_graph_dump. -2012-02-01 - xxxxxxx - lavc 54.01.0 +2012-02-01 - 316fc74 - lavc 54.01.0 Add av_fast_padded_malloc() as alternative for av_realloc() when aligned memory is required. The buffer will always have FF_INPUT_BUFFER_PADDING_SIZE zero-padded bytes at the end. -2012-01-31 - xxxxxxx - lavf 54.01.0 +2012-01-31 - dd6d3b0 - lavf 54.01.0 Add avformat_get_riff_video_tags() and avformat_get_riff_audio_tags(). -2012-01-31 - xxxxxxx - lavc 54.01.0 +2012-01-31 - af08d9a - lavc 54.01.0 Add avcodec_is_open() function. -2012-01-30 - xxxxxxx - lavu 51.22.0 - intfloat.h +2012-01-30 - 8b93312 - lavu 51.22.0 - intfloat.h Add a new installed header libavutil/intfloat.h with int/float punning functions. diff --git a/doc/general.texi b/doc/general.texi index a1838296b5..dbf8775b71 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -497,6 +497,7 @@ following image formats are supported: @item Flash Screen Video v2 @tab X @tab X @item Flash Video (FLV) @tab X @tab X @tab Sorenson H.263 used in Flash +@item Forward Uncompressed @tab @tab X @item Fraps @tab @tab X @item H.261 @tab X @tab X @item H.263 / H.263-1996 @tab X @tab X |