diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 11:34:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 11:49:26 +0200 |
| commit | 0fbe18b63eab17562bea4b98df8307ba3a90686b (patch) | |
| tree | 95cb1a26cd7ee8db2744d363cbf45d4acda55d46 /libavformat/segafilm.c | |
| parent | fbdaebb29861d32acc93fa55fd13554a2ae32eb4 (diff) | |
| parent | 0cbb1473179d35d4eb9c9446c8ed84e197e5389b (diff) | |
| download | ffmpeg-0fbe18b63eab17562bea4b98df8307ba3a90686b.tar.gz | |
Merge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'
* commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b':
x264: Map color parameters
Conflicts:
libavcodec/libx264.c
See: 48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segafilm.c')
0 files changed, 0 insertions, 0 deletions