Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 12:30:06 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 12:31:55 +0000 (14:31 +0200)
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nut.c
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c

Simple merge
Simple merge
Simple merge
Simple merge