aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dca_syncwords.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:14:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:14:29 +0200
commit256430cf384d34c15a9ec579fbf48708502ab5f4 (patch)
treedced8448eba75c3a794f78a9d6124ee693a49228 /libavcodec/dca_syncwords.h
parentbde7f5b135c772e0122fd5df616e6de46e157167 (diff)
parentefc618aff9d68d2ddc323a5c5f892ac71951f162 (diff)
downloadffmpeg-256430cf384d34c15a9ec579fbf48708502ab5f4.tar.gz
Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'
* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162': qtrleenc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/qtrleenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dca_syncwords.h')
0 files changed, 0 insertions, 0 deletions