Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:23:33 +0000 (13:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:23:54 +0000 (13:23 +0200)
commit2655c1ac1282bbcfd7666e42aaf73014598faad5
treefc058c209497d6bcf86cb64d649cc4053926dc70
parent3afcddcff2bc55b165bb49a0758883c633296a02
parent6ff15cd569e1345bc3612fb69ad3003b104fe50d
Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'

* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d':
  Remove unreachable returns

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