On Thu, 12 Sep 2013, Alexandra Khirnova wrote:
Conflicts:
libavformat/utils.c
There's no point in keeping conflict markers in a patch like this,
especially since the conflicts only have occurred locally (when the
original version of the patch never has appeared in the public git history
yet).
---
libavformat/utils.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
The patch itself looks good though. The commit subject tag can perhaps be
changed from utils.c to lavf or something such when someone pushes it.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
