diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:24:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:46:51 +0200 |
| commit | f4b05cd8415ad6160900bb00565f9b75e356530e (patch) | |
| tree | a1b89b58a5fd5d3d657d8135169ad39075a891be /tools | |
| parent | 05b2c998c7bfea642e3541787ab5dd3847e2ba81 (diff) | |
| parent | 5e83d9aced2fc2b2e1360452794c58aba55d497c (diff) | |
| download | ffmpeg-f4b05cd8415ad6160900bb00565f9b75e356530e.tar.gz | |
Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
h264: fully support cropping.
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions