diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:25:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:25:53 +0200 |
| commit | b97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee (patch) | |
| tree | ceb13c3b2a682800cbb5abd050039d96838264fc /libavfilter/pthread.c | |
| parent | 256430cf384d34c15a9ec579fbf48708502ab5f4 (diff) | |
| parent | 10a9149de242c7bbc4e130d3d7c593b89e20f80e (diff) | |
| download | ffmpeg-b97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee.tar.gz | |
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>
Diffstat (limited to 'libavfilter/pthread.c')
0 files changed, 0 insertions, 0 deletions