diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 22:08:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:05:34 +0100 |
commit | d8151a7e944aea52d167571badc247c8d9972847 (patch) | |
tree | 00f3d6dcaf271371dc5a2ef284baefb8697d446d /libavdevice/sndio_common.h | |
parent | e970b576d28dd515d4ccd665b53763e228816cac (diff) | |
parent | a12d3188cbec15e22070e139fa5cc541da07e2c3 (diff) | |
download | ffmpeg-d8151a7e944aea52d167571badc247c8d9972847.tar.gz |
Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'
* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3':
h264: use a smaller struct for the ref lists
Conflicts:
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/sndio_common.h')
0 files changed, 0 insertions, 0 deletions