diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:53:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 00:19:35 +0200 |
| commit | 4210cbf1937375c1e92a13258333b1af4e1a4371 (patch) | |
| tree | 259a3a8559566e17870cfb005a6742d5d601c54c /libavformat/rawdec.c | |
| parent | bc4b424dfa6e52e0deaf55452263d8113d8a3c52 (diff) | |
| parent | f66d0c57b13c1b7102e1e353237af178960dd3c5 (diff) | |
| download | ffmpeg-4210cbf1937375c1e92a13258333b1af4e1a4371.tar.gz | |
Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'
* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
latm: Add a probe function
Conflicts:
libavformat/rawdec.c
See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index a9ff22ae18..9b2aa3551e 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -28,6 +28,7 @@ #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" +#include "libavutil/intreadwrite.h" #define RAW_PACKET_SIZE 1024 @@ -121,6 +122,7 @@ AVInputFormat ff_data_demuxer = { #endif #if CONFIG_LATM_DEMUXER + AVInputFormat ff_latm_demuxer = { .name = "latm", .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"), |