Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:39 +0000 (22:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:42 +0000 (22:26 +0100)
commit2bedcbf82274c08ad137257ed6d81962cf3a9ffd
tree412d41d8672b0459afdde5b6128ac083f8b066df
parenta51b192f3b8f89a1bafba629655df55348b14195
parentb651c9139e1ab222d5aab9151dcd7d6e40e49885
Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'

* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
  rtpdec_mpa_robust: Move .enc_name to the start of the struct

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