1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 983c7f4015 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>
2014-03-01 04:51:05 +01:00
..
2014-02-17 20:50:33 +01:00
2014-02-16 21:13:02 +01:00
2014-02-18 18:11:23 +01:00
2014-02-24 11:10:23 -05:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-22 18:29:17 +01:00