virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2015-02-20 22:03:54 +01:00
parent d19ca4b2ea 46ad9ac964
commit dc6eadaa45
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpdec_h264.c
View File

@@ -182,6 +182,7 @@ static int h264_handle_packet_stap_a(AVFormatContext *ctx, PayloadContext *data,
uint8_t *dst = NULL; uint8_t *dst = NULL;
int ret; int ret;
// first we are going to figure out the total size
for (pass = 0; pass < 2; pass++) { for (pass = 0; pass < 2; pass++) {
const uint8_t *src = buf; const uint8_t *src = buf;
int src_len = len; int src_len = len;
@@ -301,7 +302,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data,
// consume the STAP-A NAL // consume the STAP-A NAL
buf++; buf++;
len--; len--;
// first we are going to figure out the total size
result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len); result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len);
break; break;