1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
FFmpeg/libavcodec
Michael Niedermayer b97e3e11a9 Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
  ffv1enc: Keep coded_frame.key_frame a write-only variable

Conflicts:
	libavcodec/ffv1.h
	libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:25:53 +02:00
..
2015-07-07 22:56:30 +02:00
2015-07-20 00:03:11 +02:00
2015-07-17 00:16:45 +02:00
2015-07-17 22:14:00 +02:00
2015-07-01 20:30:48 +02:00
2015-07-10 16:21:50 +02:00
2015-07-17 00:16:45 +02:00