generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,996 Commits 24 Branches 241 Tags
Commit Graph

7 Commits

Author SHA1 Message Date
Michael Niedermayer
5227eac5b0 Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2 
* commit '6d56bc9a6d853a33fe53ab63db580c4facaba420':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
	libavformat/hevc.c
	libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:13:42 +01:00
Michael Niedermayer
186e0ff067 avformat/hevc: Make return codes consistent and more flexible 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d5e2bd86242506a5af4b290b72e1c52f62f7fb6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 12:05:29 +01:00
Michael Niedermayer
2642ad9f55 Merge commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2' into release/2.2 
* commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 12:04:54 +01:00
Michael Niedermayer
3faebed6fa Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2 
* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c':
  movenc: write hvcC tag for HEVC.

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 11:48:10 +01:00
Tim Walker
6d56bc9a6d lavf: simplify ff_hevc_annexb2mp4_buf 
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

(cherry picked from commit 34bbc81de8a49fbddb92b76dc733f40890480b2b)
 2014-03-10 19:53:44 -04:00
Tim Walker
eaa79b79b2 movenc: enable Annex B to MP4 conversion for HEVC tracks. 
(cherry picked from commit b6c61fb83e876d404ac3b0b3657ebfcafdcd1926)
 2014-03-09 16:58:26 -04:00
Tim Walker
c761379825 movenc: write hvcC tag for HEVC. 
(cherry picked from commit 20b40a597cdd4969cf1147d7c7efee2b6232524b)
 2014-03-09 16:58:21 -04:00