diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
| commit | 038e6aef7a54577a3bba6666cff21f5f4e3b2d0b (patch) | |
| tree | aa6c995c63df15efca280358172a77326700d886 /libavformat | |
| parent | 590fb5291ad434889b445e8b8d949daed97db5dd (diff) | |
| parent | 4abe3b049d987420eb891f74a35af2cebbf52144 (diff) | |
Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
hevc: rename hevc.[ch] to hevcdec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hevc.c | 2 | ||||
| -rw-r--r-- | libavformat/hevcdec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hevc.c b/libavformat/hevc.c index 7c294ef8a2..f3e283c98d 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -20,7 +20,7 @@ #include "libavcodec/get_bits.h" #include "libavcodec/golomb.h" -#include "libavcodec/hevc.h" +#include "libavcodec/hevcdec.h" #include "libavutil/intreadwrite.h" #include "avc.h" #include "avio.h" diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c index e36a0513e3..28500fb649 100644 --- a/libavformat/hevcdec.c +++ b/libavformat/hevcdec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/hevc.h" +#include "libavcodec/hevcdec.h" #include "avformat.h" #include "rawdec.h" |