diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:53:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:53:25 +0100 |
| commit | 57d59e82cbddc8f3b401ea84024e30f40a56201f (patch) | |
| tree | 0ee6db89489d294aa68b785d7a6ff23ac3604629 /libavformat/psxstr.c | |
| parent | 92b238715929a26d77e99a18fe5996bcb5796149 (diff) | |
| parent | 6dc8505417c9829414b408413a9ff5caea88fec8 (diff) | |
| download | ffmpeg-57d59e82cbddc8f3b401ea84024e30f40a56201f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmpproto: Fix assignments in if()
lavf: Fix assignments in if()
svq1enc: Fix assignments in if()
lavc: Fix assignments in if() when calling ff_af_queue_add
h264: Fix assignments in if()
truemotion2: cosmetics, reformat
Conflicts:
libavcodec/svq1enc.c
libavcodec/truemotion2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
0 files changed, 0 insertions, 0 deletions