summaryrefslogtreecommitdiff
path: root/libavformat/hevc.c
Commit message (Collapse)AuthorAge
* Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
| * lavf: always use av_freeMichael Niedermayer2014-03-10
| | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com>
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'Michael Niedermayer2014-03-10
|\| | | | | | | | | | | | | | | | | | | | | * 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-10
| | | | | | | | | | | | Use ff_hevc_annexb2mp4 instead of duplicating its functionality, and update the documentation to match the new behavior.
* | Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'Michael Niedermayer2014-03-10
|\| | | | | | | | | | | | | * commit 'ee17be3fdd37f63f4b77676820e387858908b0f4': hevc: Use get_se_golomb_long Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Use get_se_golomb_longLuca Barbato2014-03-10
| | | | | | | | | | Do not use inline functions that refer to tables present in other libraries.
* | avformat/hevc: fix mix of av_malloc() with free()Michael Niedermayer2014-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * 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-09
| |
* | Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'Michael Niedermayer2014-03-09
|/ | | | | | | | | | * 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-09