diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 15:44:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 15:44:45 +0100 |
| commit | 1d0995e3a59eb37509888cfc7c2b173fd3dbb4f7 (patch) | |
| tree | 822849c4e7d30bc82d85d3a033b9781915a21680 /libavformat/pjsdec.c | |
| parent | 47eb15b989a0bbeef6647ec97d9ee646cb8e901a (diff) | |
| parent | fb5518cfb76af414a46366f74bffb5874bf3bfc4 (diff) | |
| download | ffmpeg-1d0995e3a59eb37509888cfc7c2b173fd3dbb4f7.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Force one stream in caf muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pjsdec.c')
0 files changed, 0 insertions, 0 deletions