Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-11Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2Michael Niedermayer
* commit '6d56bc9a6d853a33fe53ab63db580c4facaba420': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11Merge commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa' into release/2.2Michael Niedermayer
* commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa': hevc: Use get_se_golomb_long Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11avformat/hevc: fix mix of av_malloc() with free()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 88c8e4afeaf74ee58b67145e0331e229d8050968) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11Merge commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2' into release/2.2Michael Niedermayer
* commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2': movenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2Michael Niedermayer
* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c': movenc: write hvcC tag for HEVC. Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11lavf: simplify ff_hevc_annexb2mp4_bufTim Walker
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-11hevc: Use get_se_golomb_longLuca Barbato
Do not use inline functions that refer to tables present in other libraries. (cherry picked from commit ee17be3fdd37f63f4b77676820e387858908b0f4)
2014-03-10movenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker
(cherry picked from commit b6c61fb83e876d404ac3b0b3657ebfcafdcd1926)
2014-03-10movenc: write hvcC tag for HEVC.Tim Walker
(cherry picked from commit 20b40a597cdd4969cf1147d7c7efee2b6232524b)