Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 22:54:11 +0000 (23:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 22:54:34 +0000 (23:54 +0100)
commitdb4a2976f6afb6ac16bdd455695dcc277a03416d
tree4beb864664ddb62d9a6b56dbb6ea9609f2772222
parent0a32a1b4bbcdffe5c6a61a9e8ea64a17bf31f172
parentc99915f7c74ce1249d8633cb6fd09035b8d84db7
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'

* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
  rtpdec: DV depacketizer (RFC 6469)

Conflicts:
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h

See: cbe508553ad17b277d4cb6f12f61aac4f52908b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h