diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:52:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:57:28 +0200 |
| commit | a9bd51b1e647d7ec0b7661e19b87ade86098b38c (patch) | |
| tree | 37682f77a88bc8e09eb97fbc923192292a1abbe4 /libavformat/smjpeg.c | |
| parent | a33ed6bc74b6b8ada925c76c4084afcf8870a048 (diff) | |
| parent | 9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc (diff) | |
| download | ffmpeg-a9bd51b1e647d7ec0b7661e19b87ade86098b38c.tar.gz | |
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>
Diffstat (limited to 'libavformat/smjpeg.c')
0 files changed, 0 insertions, 0 deletions