diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:14:57 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:16:01 +0200 |
| commit | 9b35242370be013074de4c48ac9156bd9e88d6d6 (patch) | |
| tree | c05da9e854653187d6f2d4ca7a2f9cd25be25d75 /libavformat | |
| parent | 1994a73a6ba424c03080f02e6b98ef96b7079c47 (diff) | |
| parent | b7f98659f21dce438c33b512e25fd64b8d07c347 (diff) | |
| download | ffmpeg-9b35242370be013074de4c48ac9156bd9e88d6d6.tar.gz | |
Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dvenc.c | 1 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 422823c56f..93c103b316 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -35,6 +35,7 @@ #include "libavcodec/dv_profile.h" #include "libavcodec/dv.h" #include "dv.h" +#include "libavutil/avassert.h" #include "libavutil/fifo.h" #include "libavutil/mathematics.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 786be9f3bc..f73cb410a8 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -21,8 +21,9 @@ #include "libavutil/mathematics.h" #include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" #include "libavutil/time.h" -#include "libavcodec/get_bits.h" + #include "avformat.h" #include "network.h" #include "srtp.h" |