diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:47:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:47:04 +0200 |
| commit | b043d80be4d8d1a5d16f3e864ebff3a4bbe9c509 (patch) | |
| tree | fd0c38d2dfc62413d263e7f9a11b903eda24dddb /libavformat/pcmenc.c | |
| parent | 4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e (diff) | |
| parent | 21fd2f84ce21f8e03d0287a759cdcc5a5ea1d0a8 (diff) | |
| download | ffmpeg-b043d80be4d8d1a5d16f3e864ebff3a4bbe9c509.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm_bluray: cosmetics
Conflicts:
libavcodec/pcm-bluray.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcmenc.c')
0 files changed, 0 insertions, 0 deletions