diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:03:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:03:54 +0100 |
| commit | dc6eadaa458aa2e3ce407459b37e8f8403e455b4 (patch) | |
| tree | 0dfb795170c80f4573686bed495fe0898cb746d4 | |
| parent | d19ca4b2eae2d4c9170dfa559472e26730fca4a3 (diff) | |
| parent | 46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7 (diff) | |
| download | ffmpeg-dc6eadaa458aa2e3ce407459b37e8f8403e455b4.tar.gz | |
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index c8a65320f4..d3439b9fc0 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -182,6 +182,7 @@ static int h264_handle_packet_stap_a(AVFormatContext *ctx, PayloadContext *data, uint8_t *dst = NULL; int ret; + // first we are going to figure out the total size for (pass = 0; pass < 2; pass++) { const uint8_t *src = buf; int src_len = len; @@ -301,7 +302,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, // consume the STAP-A NAL buf++; len--; - // first we are going to figure out the total size result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len); break; |