aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-26 00:34:12 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-26 00:34:27 +0200
commit15bcbc9d3b88b7f2564eca81b754b6d863906bb9 (patch)
tree888b3bd58611796e8c8bbb3716cd1eb2ecdcd010 /libavformat/mpeg.c
parenta822c3bd7974469d3d86abb29c8309238b5986c5 (diff)
parentf89f78c1c563d98f10ee1d7e1ed67c9f9e03b741 (diff)
downloadffmpeg-15bcbc9d3b88b7f2564eca81b754b6d863906bb9.tar.gz
Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'
* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741': lavc: add a HEVC mp4->annex B bitstream filter Conflicts: Changelog Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions