Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 22:19:28 +0000 (23:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 22:22:10 +0000 (23:22 +0100)
commit0d71e825dbb36a61c47a9f7847fa240700791430
tree75fa873a2bab642b075f702e9c15ca6d946eaa2b
parent66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2
parent897d5c3a4296f3da80b8699d1487328ca2de8e55
Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'

* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
libavformat/mux.c

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