diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 00:44:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 00:54:28 +0200 |
| commit | bce42e95d13e3cc9c32bcd75d127c0152e51471d (patch) | |
| tree | ec7e1e19748ce5ee666d2f89aa0fc306d8f462e5 /libavcodec/libxvid_rc.c | |
| parent | b18c9f1eb024abd239c16636f1ef3a9a02d6f262 (diff) | |
| parent | 313f9fbfbb5a45eefe4bfe7b04e6c83f9b5f77c7 (diff) | |
| download | ffmpeg-bce42e95d13e3cc9c32bcd75d127c0152e51471d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add POWER[5-7] support
arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
vqavideo: return error if image size is not a multiple of block size
cosmetics: indentation
avformat: only fill-in interpolated timestamps if duration is non-zero
avformat: remove a workaround for broken timestamps
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid_rc.c')
0 files changed, 0 insertions, 0 deletions