diff options
| author | Martin Storsjö <martin@martin.st> | 2013-03-25 14:11:41 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-03-26 09:50:02 +0200 |
| commit | f1e9398621af0bc9d166014e4ce6996bb4f141d0 (patch) | |
| tree | f4a7c9b8055d6fa5852bbbc53bba9444f137e36c /libavformat/mpegtsenc.c | |
| parent | 75644335b907919057960716508477239c26fed4 (diff) | |
| download | ffmpeg-f1e9398621af0bc9d166014e4ce6996bb4f141d0.tar.gz | |
lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo
Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 44a5e5b089..8efd93ef31 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -22,9 +22,10 @@ #include "libavutil/bswap.h" #include "libavutil/crc.h" #include "libavutil/dict.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" -#include "libavcodec/mpegvideo.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" #include "mpegts.h" @@ -1019,7 +1020,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } do { - p = avpriv_mpv_find_start_code(p, buf_end, &state); + p = avpriv_find_start_code(p, buf_end, &state); av_dlog(s, "nal %d\n", state & 0x1f); } while (p < buf_end && (state & 0x1f) != 9 && (state & 0x1f) != 5 && (state & 0x1f) != 1); |