diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 22:11:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 22:11:43 +0200 |
| commit | 20526f2e2f58cb226e9891aec7d7e438a7ddb6d2 (patch) | |
| tree | 42b57f0395b81a30dc496e215c3ebe933101e794 /libavformat/westwood_vqa.c | |
| parent | 4ed3a01d717f120ba6881815ad6c40ad3f625825 (diff) | |
| parent | 9af7e8045e3e63ab39adedae9a7c11b1c410af26 (diff) | |
| download | ffmpeg-20526f2e2f58cb226e9891aec7d7e438a7ddb6d2.tar.gz | |
Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
lavc: Clarify the behaviour of dimension and format context fields
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/westwood_vqa.c')
0 files changed, 0 insertions, 0 deletions