summaryrefslogtreecommitdiffstats
path: root/libavformat/hevc.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'Michael Niedermayer2014-03-101-2/+2
|\ | | | | | | | | | | | | | | | | | | | | * commit '34bbc81de8a49fbddb92b76dc733f40890480b2b': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: simplify ff_hevc_annexb2mp4_bufTim Walker2014-03-101-2/+2
| | | | | | | | | | | | Use ff_hevc_annexb2mp4 instead of duplicating its functionality, and update the documentation to match the new behavior.
* | avformat/hevc: Make return codes consistent and more flexibleMichael Niedermayer2014-03-091-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'Michael Niedermayer2014-03-091-0/+48
|\ \ | |/ | | | | | | | | | | * commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926': movenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-091-0/+48
| |
* | Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'Michael Niedermayer2014-03-091-4/+4
|/ | | | | | | | | | * commit '20b40a597cdd4969cf1147d7c7efee2b6232524b': movenc: write hvcC tag for HEVC. Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* movenc: write hvcC tag for HEVC.Tim Walker2014-03-091-0/+50
OpenPOWER on IntegriCloud