Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:14:33 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:14:33 +0000 (14:14 +0200)
commit4f32efdff007024869ab2755c9223c159ace4442
treef132cf9e5e668d498b8ff4c021a419a9568e3c8c
parent4fac4447d153b2a8e88ce7274b851459d7cd93f6
parentc3311d472a7528c67f76d0d061704ae70a99b32e
Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

* commit 'c3311d472a7528c67f76d0d061704ae70a99b32e':
  avienc: sanitize variable naming in write_header()

Conflicts:
libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avienc.c