Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:52:55 +0000 (15:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:57:28 +0000 (15:57 +0200)
commita9bd51b1e647d7ec0b7661e19b87ade86098b38c
tree37682f77a88bc8e09eb97fbc923192292a1abbe4
parenta33ed6bc74b6b8ada925c76c4084afcf8870a048
parent9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc
Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
  mpegvideo: fix indentation
  sws: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavcodec/mpegvideo.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/output.c
libswscale/swscale-test.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c