diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 09:50:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 09:50:26 +0200 |
| commit | 947f2d4d34f29a8bc51fd4a97718b1c163d7a55d (patch) | |
| tree | cce68e10d61b9d8fe6b2ee7e4d165d6a438f8abb /libavformat/wtv.c | |
| parent | 6df20d0d350793b89c3ff541cf453ae69cf99beb (diff) | |
| parent | 55c4cba2a7037161ea56b2d55b347c8381df7f1e (diff) | |
| download | ffmpeg-947f2d4d34f29a8bc51fd4a97718b1c163d7a55d.tar.gz | |
Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
huffyuvenc: BGRA support
Conflicts:
libavcodec/huffyuvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtv.c')
0 files changed, 0 insertions, 0 deletions