mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
8e576d5830
* qatar/master: libavutil: add utility functions to simplify allocation of audio buffers. libavutil: add planar sample formats and av_sample_fmt_is_planar() avconv: fix segfault at EOF with delayed pictures pcmdec: remove unneeded resetting of samples pointer avconv: remove a now unused parameter from output_packet(). avconv: formatting fixes in output_packet() avconv: declare some variables in blocks where they are used avconv: use the same behavior when decoding audio/video/subs bethsoftvideo: return proper consumed size for palette packets. cdg: skip packets that don't contain a cdg command. crcenc: add flags avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats. tiffenc: add a private option for selecting compression algorithm md5enc: add flags ARM: remove needless .text/.align directives Conflicts: doc/APIchanges libavcodec/tiffenc.c libavutil/avutil.h libavutil/samplefmt.c libavutil/samplefmt.h tests/ref/fate/bethsoft-vid tests/ref/fate/cdgraphics tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/mpeg2-field-enc tests/ref/fate/nuv tests/ref/fate/tiertex-seq tests/ref/fate/tscc-32bit tests/ref/fate/vmnc-32bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
28 lines
732 B
Plaintext
28 lines
732 B
Plaintext
0, 0, 460800, 0x54aedafe
|
|
1, 0, 4096, 0x00000000
|
|
1, 2090, 4096, 0x4dfae7a6
|
|
0, 3003, 460800, 0xb7aa8b56
|
|
1, 4180, 4096, 0x3fd9f5c6
|
|
0, 6006, 460800, 0x283ea3b5
|
|
1, 6269, 4096, 0x7b86e310
|
|
1, 8359, 4096, 0x611cece5
|
|
0, 9009, 460800, 0x283ea3b5
|
|
1, 10449, 4096, 0xb7d8e872
|
|
0, 12012, 460800, 0x10e577de
|
|
1, 12539, 4096, 0x072ef72b
|
|
1, 14629, 4096, 0xb3560144
|
|
0, 15015, 460800, 0x4e091ee2
|
|
1, 16718, 4096, 0x0a3d119e
|
|
0, 18018, 460800, 0x2ea88828
|
|
1, 18808, 4096, 0xbe391aa4
|
|
1, 20898, 4096, 0x28f7c6e5
|
|
0, 21021, 460800, 0x4b7f4df0
|
|
1, 22988, 4096, 0xca9d9df2
|
|
0, 24024, 460800, 0xa57f20d0
|
|
1, 25078, 4096, 0x5c6b95a9
|
|
1, 27167, 4096, 0x0bdfc0bf
|
|
1, 29257, 4096, 0xd95a9277
|
|
1, 31347, 4096, 0xae2bef2c
|
|
1, 33437, 4096, 0xbf031e83
|
|
1, 35527, 4096, 0x4c83e2d1
|