diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 10:47:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 10:47:43 +0200 |
| commit | 945c7e399af230d9fde6df641f13a11dfc5d4954 (patch) | |
| tree | c88eba40bf04ced8c03fc6a7c5ae98e8ac2fa921 /libavcodec/h264.c | |
| parent | 3e0c78bac63c213649c3e8c2fa49e9f3c9848d5a (diff) | |
| parent | 38e15df1489d86c016515223ee693e7d0326c56a (diff) | |
| download | ffmpeg-945c7e399af230d9fde6df641f13a11dfc5d4954.tar.gz | |
Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
* commit '38e15df1489d86c016515223ee693e7d0326c56a':
avframe: note that linesize is not the usable data size
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions