diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 12:10:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 12:12:33 +0200 |
| commit | 294af5140132521f11723467c7230e7285702545 (patch) | |
| tree | cde71a2d89ca5efe92c7314f8f413f60f5948404 /libavcodec/assenc.c | |
| parent | 4027e136635759999ffb5fa16d1053f26c1dec5e (diff) | |
| parent | 50ec1db62d977b6e864f315a53c1c580a6d7efa4 (diff) | |
| download | ffmpeg-294af5140132521f11723467c7230e7285702545.tar.gz | |
Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'
* commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4':
4xm: fold last_picture lazy allocation in decode_p_frame
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions