diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:03:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:03:23 +0100 |
| commit | 392080cbe52868c00f8dfd4e60639c37a13165f4 (patch) | |
| tree | 3039ea6b0b267230503f674a0c355cc73049e2c6 /libavformat | |
| parent | f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1 (diff) | |
| parent | 167e004e1aca7765686ed95d7cd8ea5064d4f6f6 (diff) | |
| download | ffmpeg-392080cbe52868c00f8dfd4e60639c37a13165f4.tar.gz | |
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
h264: drop any pretense of support for data partitioning
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions