[FFmpeg-cvslog] Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'
Michael Niedermayer
git at videolan.org
Sat Mar 1 04:55:33 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 1 04:50:08 2014 +0100| [983c7f4015baee2e5565c5702dd76dc4c8620aa7] | committer: Michael Niedermayer
Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'
* commit 'ee6280ca12696a67535ce2245c77190edc513794':
h264: parse two additional constraint flags
Conflicts:
libavcodec/h264_ps.c
See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=983c7f4015baee2e5565c5702dd76dc4c8620aa7
---
More information about the ffmpeg-cvslog
mailing list