diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:30:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:49:26 +0200 |
| commit | 3244a176505b04f62f7bbb1ac7fb413399a6790c (patch) | |
| tree | 8672ecd937aa9be55ab1fc394697751259021419 /libavcodec/h263dec.c | |
| parent | b18eac7ff22332c9344769af15f7b245dd13cc64 (diff) | |
| parent | 9bb11be0e5a75782c3139ad058c2b571499aa37d (diff) | |
Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'
* commit '9bb11be0e5a75782c3139ad058c2b571499aa37d':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
0 files changed, 0 insertions, 0 deletions