diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:20:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:20:00 +0100 |
| commit | 49f11e12d5afa9cd800f3e2f753d83595d5cff5c (patch) | |
| tree | 173dde1f8a794dabad4375c708337ad4f37cb9b3 /doc/examples/demuxing_decoding.c | |
| parent | d130fae51948a2baf69dcf29fdb15f80ea2bc363 (diff) | |
| parent | 9a6a7109985cbd3a20707b40cc31ed53a174195c (diff) | |
| download | ffmpeg-49f11e12d5afa9cd800f3e2f753d83595d5cff5c.tar.gz | |
Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2
* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c':
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/demuxing_decoding.c')
0 files changed, 0 insertions, 0 deletions