Changeset 77ae9472 in ffmpeg
- Timestamp:
- Feb 17, 2015, 10:51:39 PM (10 years ago)
- Branches:
- master
- Children:
- 092ee6cd
- Parents:
- 97bd0e2a (diff), 195942ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Michael Niedermayer <michaelni@gmx.at> (02/17/15 22:50:56)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (02/17/15 22:51:39)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libavformat/riff.c
r97bd0e2a r77ae9472 365 365 { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'N') }, 366 366 { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'H') }, 367 { AV_CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, 367 368 { AV_CODEC_ID_NONE, 0 } 368 369 };
Note:
See TracChangeset
for help on using the changeset viewer.