diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:15:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:15:34 +0100 |
| commit | 57089084ba7ece20889b8196f68ad9b08e8db8ba (patch) | |
| tree | 5b2553a183a4da7485519e38c861b0a3e87c47af /doc/APIchanges | |
| parent | fa0e5ffb89b14ac9dbccd23dd50b8dcb64b75282 (diff) | |
| parent | 4cfbeef31d4e6096c0596359d212f5d99a7ba4b5 (diff) | |
| download | ffmpeg-57089084ba7ece20889b8196f68ad9b08e8db8ba.tar.gz | |
Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'
* commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5':
h264: factor hwaccel pixel formats list
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
0 files changed, 0 insertions, 0 deletions