diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-30 03:46:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-30 03:46:24 +0100 |
| commit | 00c0465dbc5acd27c736d612bbad95fdbe2ef96c (patch) | |
| tree | cf193c53844909c70470cf23c3b95c7f218b3547 /tools/trasher.c | |
| parent | 6ed3565f08abf3b1c2a1d2d7fac768b18753530c (diff) | |
| parent | 209c44526700b1bac04b9fe97c8a8fdcfbeeba00 (diff) | |
| download | ffmpeg-00c0465dbc5acd27c736d612bbad95fdbe2ef96c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off DPCM codec FATE tests into their own file
fate: split off PCM codec FATE tests into their own file
libvorbis: K&R reformatting cosmetics
libmp3lame: K&R formatting cosmetics
fate: Add a video test for xxan decoder
mpegvideo_enc: K&R cosmetics (line 1000-2000).
avconv: K&R cosmetics
qt-faststart: Fix up indentation
indeo4: remove two unused variables
doxygen: cleanup style to support older doxy
fate: add more tests for VC-1 decoder
applehttpproto: Apply the same reload interval changes as for the demuxer
applehttp: Use half the target duration as interval if the playlist didn't update
applehttp: Use the last segment duration as reload interval
lagarith: add decode support for arith rgb24 mode
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/trasher.c')
0 files changed, 0 insertions, 0 deletions