-
Michael Niedermayer authored
* commit 'efc618af': qtrleenc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/qtrleenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
256430cf
* commit 'efc618af': qtrleenc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/qtrleenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>