Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:24:19 +0000 (19:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:24:19 +0000 (19:24 +0200)
commitf478e8500a3d1fb0c6014956de42d87e292b9e3b
tree87becafb3f58cad48a56e43f173f346bb01e8c69
parenteacf7d650dfe6e97d6100a232fa6a89592b625b5
parentc9281a01b78cc3f09e36300a0ca3f5824d1c74cf
Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'

* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
  lavf: drop the zero-sized packets hack

Conflicts:
libavformat/mux.c

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