1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Files
FFmpeg/libavcodec
Michael Niedermayer f2a581e2ee Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
  proresenc: Do not entangle coded_frame

Conflicts:
	libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:44:53 +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-17 00:16:45 +02:00