Michael Niedermayer
|
7f90055470
|
Merge commit '34bbc81de8 '
* commit '34bbc81de8 ':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-10 23:38:01 +01:00 |
|
Tim Walker
|
34bbc81de8
|
lavf: simplify ff_hevc_annexb2mp4_buf
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.
|
2014-03-10 18:02:36 +01:00 |
|
Michael Niedermayer
|
5d5e2bd862
|
avformat/hevc: Make return codes consistent and more flexible
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-09 23:12:45 +01:00 |
|
Michael Niedermayer
|
a379813cee
|
Merge commit 'b6c61fb83e '
* commit 'b6c61fb83e ':
movenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-09 23:08:33 +01:00 |
|
Michael Niedermayer
|
1b1d77ae9b
|
Merge commit '20b40a597c '
* commit '20b40a597c ':
movenc: write hvcC tag for HEVC.
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-09 22:48:08 +01:00 |
|
Tim Walker
|
b6c61fb83e
|
movenc: enable Annex B to MP4 conversion for HEVC tracks.
|
2014-03-09 18:09:40 +01:00 |
|
Tim Walker
|
20b40a597c
|
movenc: write hvcC tag for HEVC.
|
2014-03-09 18:09:40 +01:00 |
|