diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:32:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:32:13 +0100 |
| commit | 15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (patch) | |
| tree | a61799d00fe85fbc8ef097a6dcec6dc704c79235 /libavcodec/h264pred.c | |
| parent | e730c3a2cbc4070f3e1799d2a6789f239f7377b1 (diff) | |
| parent | f61272f0efd80da437570aad2c40e00f9d3f4fe6 (diff) | |
| download | ffmpeg-streaming-15daa8f9ddaf678b924ebe997f7b62381c0e2e0a.zip ffmpeg-streaming-15daa8f9ddaf678b924ebe997f7b62381c0e2e0a.tar.gz | |
Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
ratecontrol: K&R cosmetic formatting
rtpdec: Remove a useless todo comment
Conflicts:
libavcodec/ratecontrol.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.c')
0 files changed, 0 insertions, 0 deletions
