diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:50:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:51:05 +0100 |
| commit | 983c7f4015baee2e5565c5702dd76dc4c8620aa7 (patch) | |
| tree | 4c7a5eaca307ca09de3d9ad426c4f0ba93970475 /tools | |
| parent | 3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab (diff) | |
| parent | ee6280ca12696a67535ce2245c77190edc513794 (diff) | |
| download | ffmpeg-983c7f4015baee2e5565c5702dd76dc4c8620aa7.tar.gz | |
Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'
* commit 'ee6280ca12696a67535ce2245c77190edc513794':
h264: parse two additional constraint flags
Conflicts:
libavcodec/h264_ps.c
See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions