apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-27 01:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  h264: new assembly version of get_cabac for x86_64 with PIC
  h264: use one table instead of several for cabac functions
  h264: (trivial) remove unneeded macro argument in x86/cabac.h
  libschroedingerdec: check malloc
  segment: reorder seg_write_header allocation
  avio: make avio_close(NULL) a no-op
  mov: Parse EC3SpecificBox (dec3 atom).

Conflicts:
	libavcodec/cabac.c
	libavcodec/x86/cabac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-04-28 20:45:06 +02:00
parent c31be45e14 9b9df1cdff
commit 9d7c1b4cf3
4 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/aviobuf.c
+5 -1
View File
@@ -785,8 +785,12 @@ int avio_open2(AVIOContext **s, const char *filename, int flags,
int avio_close(AVIOContext *s)
{
URLContext *h = s->opaque;
URLContext *h;
if (!s)
return 0;
h = s->opaque;
av_free(s->buffer);
av_free(s);
return ffurl_close(h);